Merge branch 'trunk' of git://git.mvlcstaff.org/tsbere/ILS into installer
authorThomas Berezansky <tsbere@mvlc.org>
Wed, 20 Apr 2011 18:03:20 +0000 (14:03 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Wed, 20 Apr 2011 18:03:20 +0000 (14:03 -0400)
commita3feb8a758b99a44ef85fb23fdb92bf110e09b8c
tree938502204a716a72ecc17151eae115935c566916
parent89fb3f758e65c9d2bc5ec04b09ca14c4012f9bb7
parentf9dd5a5212eaa66a41e0d6cb781c4e6bd563b005
Merge branch 'trunk' of git://git.mvlcstaff.org/tsbere/ILS into installer