Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Mon, 20 Jun 2011 15:52:13 +0000 (11:52 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 20 Jun 2011 15:52:13 +0000 (11:52 -0400)
commitc5ea6407ec7d028b08bd68f4e8bdc6ceb1fa1f12
tree664054c6452068e794933aeb5e7b42199ab07699
parentaa0c068d48426f07a2134577b6fc23ac89db1683
parentb066d2c3b129e8d0738a061e23200d8311d251bf
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement