Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Thu, 10 Jan 2013 14:15:02 +0000 (09:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Thu, 10 Jan 2013 14:15:02 +0000 (09:15 -0500)
commitb7f22547a84acef62be22748f4fa004fb618077f
tree674603dfe6681b4830b67ae4a871bd046d8649ef
parentafe077ac0c84bc079fc7751c75adb0299ad6c85d
parent8e854c6a4edafe506780573fafe35c5e647a3e58
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen