Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 1 Aug 2012 20:15:05 +0000 (16:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 1 Aug 2012 20:15:05 +0000 (16:15 -0400)
commit499b55a4ebaf47cfd32e164a7dc01c2cc7422bee
treee0f5acecd030471bc95ba9040e8e1248bb4e38ab
parentdef1068435b297e21b03f3415038572f2b02d0e1
parent8227dd59af80c12740ad51ea076d7e5806b8ff62
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen