Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 21 Nov 2012 16:15:02 +0000 (11:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 21 Nov 2012 16:15:02 +0000 (11:15 -0500)
commit3c52fa26214d118f3ea74d37c638a1c41531ecbe
tree43676c4cecb8b0b80fe79ecbd8ac8715c224b759
parentb0e87afef4b53bbf19de8c1baa31d5e61657027c
parente14abbde87d0f03b6943505f09c66e0d2d589f7a
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen