Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Mon, 14 Jan 2013 23:15:07 +0000 (18:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Mon, 14 Jan 2013 23:15:07 +0000 (18:15 -0500)
commitfbbd97bba7d5e8788df667cf6dd3c74cdcf424f0
tree491dc27a43a2e2f8a202fa4fdacf538242a487e9
parentadf66f6543b6ce6486caad948dd422dee6878bc1
parente56f3e59be42ee727efb6c20e4697ab45c909fc5
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen