Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorJason Etheridge <jason@esilibrary.com>
Fri, 26 Aug 2011 20:03:15 +0000 (16:03 -0400)
committerJason Etheridge <jason@esilibrary.com>
Fri, 26 Aug 2011 20:03:15 +0000 (16:03 -0400)
commit817a79b3c110e278b560f0f88f4fcfd30faa91a4
tree5f20c25d0e861e2e10dd0f01ceac3fbe19c2563e
parent6a1aa49194919a29ea77f09a2387aadd7d7790ff
parent2ec43ab54aeea5b08205ab9f1c4c3473fa632263
Merge branch 'master' of git.evergreen-ils.org:Evergreen