Merge branch 'master' of git://git.mvlcstaff.org/tsbere/ILS into build_version
authorThomas Berezansky <tsbere@mvlc.org>
Wed, 25 May 2011 02:52:08 +0000 (22:52 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Wed, 25 May 2011 02:52:08 +0000 (22:52 -0400)
commita9d306d30cf5913d93ffbf6a1995430f545cf246
treef37f24e600131a62455ab07d608230defeacb9c6
parent02b33781aeb9fc1ef2dc985ea418fc55e1e93060
parent8bb24e67e89c016dfc7d3d0c0c717da3e46fdbad
Merge branch 'master' of git://git.mvlcstaff.org/tsbere/ILS into build_version