Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 17:12:07 +0000 (13:12 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 17:12:07 +0000 (13:12 -0400)
commit656bea628cbe407b367e43273a3136f8ab1a8279
treed805a8cfe2b7bbf37282ebc77be9a20aea6b1eaa
parenta0347d824c6090ed0bea8ff418c615d2fed086bd
parentac80f3b7c3e6e3104ad81ce8a424814155ee728d
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement