Merge branch 'master' of git://git.koha-community.org/kohadocs
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 3 Nov 2016 20:53:17 +0000 (09:53 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 3 Nov 2016 20:53:17 +0000 (09:53 +1300)

Trivial merge