Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 17 Aug 2012 18:15:05 +0000 (14:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 17 Aug 2012 18:15:05 +0000 (14:15 -0400)
commitca8d5320ea7058d29b508e535dd0a687b3a34fa6
treec318be95c0acc0697876394f0eb85a94fcba490b
parente44dd12c3eb0a32537d6aa038456a611cfd9b35a
parent4330a43e7f7a60cb62fe2babecc3014c1449bc96
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen