From: William Rockwood <wrockwood@tadl.org>
Date: Thu, 13 Jun 2013 17:53:02 +0000 (-0400)
Subject: Merge branch 'rel_2_2' of hades.lib.tadl.org:/opt/git/Evergreen_templates_tadlskin... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a2978cb30a35b67dc8e1652bf6ddaee58d0bc502;p=evergreen%2Ftadl.git

Merge branch 'rel_2_2' of hades.lib.tadl.org:/opt/git/Evergreen_templates_tadlskin into rel_2_2
---

a2978cb30a35b67dc8e1652bf6ddaee58d0bc502