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)

Trivial merge