From: Galen Charlton <gmc@esilibrary.com>
Date: Wed, 20 Nov 2013 18:34:51 +0000 (+0000)
Subject: Merge branch '3.14.x'
X-Git-Tag: v3.16.00-beta~1175
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=e71593035d97beb02f0b9b22a197e25c7e37fbca;p=koha_fer

Merge branch '3.14.x'
---

e71593035d97beb02f0b9b22a197e25c7e37fbca