From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Wed, 28 Jul 2010 21:35:42 +0000 (+1200)
Subject: Merge remote branch 'kc/master'
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=c6a38d75b3acd9a257e2a35e7205dac5afb8a1f5;p=koha.git

Merge remote branch 'kc/master'
---

c6a38d75b3acd9a257e2a35e7205dac5afb8a1f5