From: rsoulliere <robert.soulliere@mohawkcollege.ca>
Date: Wed, 30 Nov 2011 20:25:00 +0000 (-0500)
Subject: Merge branch 'rel_2_1'
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=67b1a34162b9d2643bcacfb769f348c50815353e;p=contrib%2FConifer.git

Merge branch 'rel_2_1'
---

67b1a34162b9d2643bcacfb769f348c50815353e