Merge branches 'master' and 'mymerges'
tree1756f6ee8c051b7498c77fce95168f34c9cf4b7b
-rwxr-xr-x 295 .htaccess
drwxr-xr-x - C4
-rw-r--r-- 97 MANIFEST.SKIP
-rw-r--r-- 6515 Makefile.PL
-rw-r--r-- 3024 README.txt
-rwxr-xr-x 2642 about.pl
drwxr-xr-x - acqui
drwxr-xr-x - admin
drwxr-xr-x - authorities
drwxr-xr-x - catalogue
drwxr-xr-x - cataloguing
drwxr-xr-x - circ
-rwxr-xr-x 3667 edithelp.pl
drwxr-xr-x - etc
-rwxr-xr-x 1774 help.pl
-rw-r--r-- 1646 install-CPAN.pl
drwxr-xr-x - installer
drwxr-xr-x - koha-tmpl
-rw-r--r-- 510 kohaversion.pl
drwxr-xr-x - labels
drwxr-xr-x - localfile
-rwxr-xr-x 1968 mainpage.pl
drwxr-xr-x - members
drwxr-xr-x - misc
drwxr-xr-x - opac
drwxr-xr-x - reports
drwxr-xr-x - reserve
drwxr-xr-x - reviews
-rw-r--r-- 3596 rewrite-config.PL
drwxr-xr-x - rss
drwxr-xr-x - serials
drwxr-xr-x - suggestion
drwxr-xr-x - t
drwxr-xr-x - tools
drwxr-xr-x - updater
drwxr-xr-x - virtualshelves