Merge branch 'release-3.0'

Conflicts:
	composer.json

build.xml

@@ -28,7 +28,7 @@
   <property name="php-cs-fixers" value="no_blank_lines_before_namespaces,function_call_space,trailing_spaces,unused_use,lowercase_keywords,encoding,parenthesis,php_closing_tag,visibility,duplicate_semicolon,extra_empty_lines,no_blank_lines_after_class_opening,no_empty_lines_after_phpdocs,operators_spaces,spaces_before_semicolon,ternary_spaces,concat_with_spaces,short_array_syntax,phpdoc_no_access,remove_leading_slash_use,eof_ending" />
 
 
-  <property name="version" value="3.0.1" />
+  <property name="version" value="3.0.2" />
 
   <!-- We only need the -p switch if the password is non-blank -->
   <if><not><equals arg1="${mysqlrootpass}" arg2="" /></not><then>

composer.json

@@ -8,12 +8,6 @@
         }
     ],
     "license": "GPL-2.0",
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://packages.zendframework.com/"
-        }
-    ],
     "require": {
         "aferrandini/phpqrcode": "1.0.1",
         "jasig/phpcas": "1.3.3",

config/vufind/config.ini

@@ -109,7 +109,7 @@ showBulkOptions = false
 ; Should users be allowed to save searches in their accounts?
 allowSavedSearches = true
 ; Generator value to display in an HTML header <meta> tag:
-generator = "VuFind 3.0.1"
+generator = "VuFind 3.0.2"
 
 ; This section allows you to configure the mechanism used for storing user
 ; sessions.  Available types: File, Memcache, Database.

packages/DEBIAN/changelog

+vufind 3.0.2 distribution; urgency=low
+
+  * VuFind 3.0.2 release (see http://vufind.org/wiki/changelog for details) 
+
+ -- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net>  Tu 5 Jul 2016 12:02:33 UTC
+
 vufind 3.0.1 distribution; urgency=low
 
   * VuFind 3.0.1 release (see http://vufind.org/wiki/changelog for details) 

packages/DEBIAN/control

 Package: vufind
-Version: 3.0.1
+Version: 3.0.2
 Section: World Wide Web
 Priority: Optional
 Architecture: all