Merge branch 'trunk' of git://git.mvlcstaff.org/tsbere/ILS into installer
authorThomas Berezansky <tsbere@mvlc.org>
Thu, 17 Mar 2011 14:57:45 +0000 (10:57 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Thu, 17 Mar 2011 14:57:45 +0000 (10:57 -0400)
commit214ad2b0a2a9b858f5c2ee9c92592fdf16d956fa
treeea530c4bc78793621b2c9fb5491fa8bd8baacd2a
parentbc12200ea9bcd133166c25e164ffe37707e40684
parent0167e9f91f8660f15f423a4fb839246c170cb2d3
Merge branch 'trunk' of git://git.mvlcstaff.org/tsbere/ILS into installer