Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Tue, 14 Jun 2011 22:12:04 +0000 (18:12 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 14 Jun 2011 22:12:04 +0000 (18:12 -0400)
commit02966f67037f1db4d05d654ed7384b65b41c9f14
tree4b791afda5454eca8189c3a5b07b5518b6cd6d69
parentd613dbe0048fad70a7be777aa66ec745e0717266
parent0c2d1a7a9bbeaa368a431ffc94e63dbb9e36592c
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets