Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 27 Jun 2012 18:15:06 +0000 (14:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 27 Jun 2012 18:15:06 +0000 (14:15 -0400)
commit7149088d60b92f706cab6f074eceb9ac7e75cf15
treea366c00a30c789f6bb097dc9208e1d04afcd075f
parentb96b07447e98447bc8175903a7d19f0571888656
parent4c8a1b71ebd961ebe2a5dffcb1690ea6fb6b281b
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen