Merge branch 'trunk' of git://git.mvlcstaff.org/tsbere/ILS into installer
authorThomas Berezansky <tsbere@mvlc.org>
Mon, 18 Apr 2011 21:36:53 +0000 (17:36 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Mon, 18 Apr 2011 21:36:53 +0000 (17:36 -0400)
commit4f5206df4ac784c13f373c6c74d93bc202164ef6
treed9e8e90ab7f19c34d724e5e848c90a02867cbc9d
parent09499ed9f018acc3a290c7f861870c26c5fddbfc
parent307a43715f7a4657336cc2d8a09e88e2efbf0977
Merge branch 'trunk' of git://git.mvlcstaff.org/tsbere/ILS into installer