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)
commit239bfb7dd14f2bd66308d14046c02e64562f2483
tree2e38e2d5bafd076f86d4ef7fb3127675e7355ae1
parent5f1fb6d3c927b2f3aa3ea9ab12b4c408be3a4988
parent1cb409297cda2df25d5623400b3601689320c544
Merge branch 'master' of git://git.koha-community.org/kohadocs