From: Dan Scott <dan@coffeecode.net>
Date: Wed, 23 May 2012 20:16:38 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into doc_consolidation_master
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a39e81fbe4a2ee69519b709dc84e6a03a65cc328;p=evergreen%2Fjoelewis.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen into doc_consolidation_master
---

a39e81fbe4a2ee69519b709dc84e6a03a65cc328