From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Wed, 1 Jun 2011 21:02:50 +0000 (+1200)
Subject: Merge remote-tracking branch 'kc/master' into new/bug_5683
X-Git-Url: http://git.rot13.org/?p=koha.git;a=commitdiff_plain;h=7aa3a055914d4c8757455898208848619f5aaec5

Merge remote-tracking branch 'kc/master' into new/bug_5683
---

7aa3a055914d4c8757455898208848619f5aaec5