Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp816627
authorJason Stephenson <jstephenson@mvlc.org>
Thu, 22 Sep 2011 19:16:40 +0000 (15:16 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Thu, 22 Sep 2011 19:16:40 +0000 (15:16 -0400)
commit2c811f1630bfa246de7b11160184c545ec79edf8
tree88b52172255970e742215d40f408d893bf53a3a1
parent1f4207c7bf82432fea45dcf8669923d49816bacc
parent9b4693f07a26eed41dfdd98cbc8a59a1a6070962
Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp816627