From: Mike Rylander <mrylander@gmail.com>
Date: Sun, 24 Jul 2011 15:14:15 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c0b13ededa3340f6f2085abf76a87e4f162a1c60;p=contrib%2FConifer.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
---

c0b13ededa3340f6f2085abf76a87e4f162a1c60