Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Tue, 14 Jun 2011 22:12:14 +0000 (18:12 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 14 Jun 2011 22:12:14 +0000 (18:12 -0400)
commit0fe399cc1ebfa6a4a998bce8deffc9cfbc78b750
treeba38fdc80af8f24cc20439af77931c1ec517d7c3
parent248d8255e14f0ebdce37cfb2d7ce72bc17265f3b
parent0c2d1a7a9bbeaa368a431ffc94e63dbb9e36592c
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin