From: Galen Charlton <gmcharlt@gmail.com>
Date: Sun, 6 Sep 2009 01:45:39 +0000 (-0400)
Subject: Merge commit 'origin/master' into labels_recon
X-Git-Tag: v3.02.00-alpha~157^2
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=9890a4880090292c64e8e78ef4976bdfa188d545;p=koha.git

Merge commit 'origin/master' into labels_recon
---

9890a4880090292c64e8e78ef4976bdfa188d545