Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Sat, 19 Jan 2013 20:15:02 +0000 (15:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Sat, 19 Jan 2013 20:15:02 +0000 (15:15 -0500)
commit30cfc44f3dd141d85d762726e8c440ce39af5539
treecded7021620b3cb92214803cf5bc77281444e6af
parent88f71250ec79554ae6b6b3f1ea10f6bcc29d8ff0
parent3f211c52fb8a34bcdfdd66287b1d6ebd784d0a81
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen