Merge branch 'master' of git.rot13.org:/git/ferlib2koha
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 18 Jun 2011 17:44:49 +0000 (19:44 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 18 Jun 2011 17:44:49 +0000 (19:44 +0200)

Trivial merge