Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp816627
authorJason Stephenson <jstephenson@mvlc.org>
Wed, 7 Sep 2011 18:01:54 +0000 (14:01 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Wed, 7 Sep 2011 18:01:54 +0000 (14:01 -0400)
commit1062b575b4aa0ebce47f35d2461c06b44b65107c
tree322f3928ebc348277df6aecefa424b0b679c3cad
parent9a86659599d081e948fba1f88dce816d16db9d78
parent8fa616a1ea7395e313168e7b2ca575a43a6483f9
Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp816627