Merge branch 'master' of git://git.koha-community.org/kohadocs
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 22 May 2012 01:33:22 +0000 (13:33 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 22 May 2012 01:33:22 +0000 (13:33 +1200)

Trivial merge