Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Sun, 15 May 2011 17:42:17 +0000 (13:42 -0400)
committerMike Rylander <mrylander@gmail.com>
Sun, 15 May 2011 17:42:17 +0000 (13:42 -0400)
commit0de249e946f9714f36d9382f35c2b3a8efca85d4
tree0ed96b7d1439211898e95a1c45c86ef64c84df8d
parent78bf023beae5c73197cff39c12ead1a15c84f256
parentcce32dd86098980d1fc87523141f0adf958f9ce5
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement