Merge remote branch 'koha-translate/3.12.15-translate' into HEAD
authorKyle M Hall <kyle@bywatersolutions.com>
Fri, 10 Oct 2014 12:47:53 +0000 (08:47 -0400)
committerKyle M Hall <kyle@bywatersolutions.com>
Fri, 10 Oct 2014 12:47:53 +0000 (08:47 -0400)
commit15f2be3d0a0f042b52f180a4ae5ebb9a7919b681
tree8cdf0326572a0bd8be9c4e4ffe5bd9bf19853390
parentb2251950b7e76172dfb3b3bc9a2d50d94a5f1f77
parentc0b0f68f30dc10483822e821fc9f00df548c091e
Merge remote branch 'koha-translate/3.12.15-translate' into HEAD