Merge branch '7.x' into 7.x-release

Conflicts: islandora.info
12 years ago · 02fa996dca
1 changed files with 1 additions and 0 deletions
--- a/islandora.info
+++ b/islandora.info
@ -6,3 +6,4 @@ core = 7.x
 configure = admin/islandora/configure
 stylesheets[all][] = css/islandora.base.css
 stylesheets[all][] = css/islandora.theme.css
+php = 5.3