Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 16 Jan 2013 22:15:02 +0000 (17:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 16 Jan 2013 22:15:02 +0000 (17:15 -0500)
commit88f71250ec79554ae6b6b3f1ea10f6bcc29d8ff0
tree30afbdfc7dce847414162d771c1c2648170f4d7f
parentedc4a296256897e8d2642f9c253fd926af874016
parentee6b43a6782b9b0b7d462e51bf19d182d891719f
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen