From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Sun, 13 Jun 2010 21:15:00 +0000 (+1200)
Subject: Merge commit 'kc/master'
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=4c14cd317e92cb44aed69f09e99438f694ae32e5;p=koha.git

Merge commit 'kc/master'
---

4c14cd317e92cb44aed69f09e99438f694ae32e5