From: rsoulliere <robert.soulliere@mohawkcollege.ca>
Date: Thu, 19 May 2011 12:38:17 +0000 (-0400)
Subject: Merge remote branch 'ysuarez/master' into github_online
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7047fce0eacac1b89fd2361ed6a06a09e5035aca;p=contrib%2FConifer.git

Merge remote branch 'ysuarez/master' into github_online
---

7047fce0eacac1b89fd2361ed6a06a09e5035aca