From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Thu, 24 Jun 2010 22:43:18 +0000 (+1200)
Subject: Merge commit 'kc/master'
X-Git-Url: http://git.rot13.org/?p=koha.git;a=commitdiff_plain;h=f245998ac964881e9cc2b36434860c55698e8701

Merge commit 'kc/master'

Conflicts:
	docs/history.txt
---

f245998ac964881e9cc2b36434860c55698e8701