Merge remote-tracking branch 'stevee/mc-update' into thirteen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Dec 2012 20:57:38 +0000 (21:57 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Dec 2012 20:57:38 +0000 (21:57 +0100)
commit91b20d84de68c80e230838e81a470c7bf5d3457b
tree98623157cbd59866601934671949936336948afa
parenta57072e3f1060dbf09ae4a842f5500551a09ef7c
parenta7ade35692705f4bbfbf4e1b5ea4d5b4de97840c
Merge remote-tracking branch 'stevee/mc-update' into thirteen
lfs/mc