From: Jared Camins-Esakov <jcamins@cpbibliography.com>
Date: Sun, 2 Dec 2012 14:16:50 +0000 (-0500)
Subject: Merge branch 'bug_9154' into 3.12-master
X-Git-Tag: v3.12.00-alpha~363
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=970ff591d9adb4aa8cac85ba067e00a37060fa08;hp=-c;p=koha-ffzg.git

Merge branch 'bug_9154' into 3.12-master
---

970ff591d9adb4aa8cac85ba067e00a37060fa08