Merge remote-tracking branch 'amarx/BUG10693' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 15:52:17 +0000 (16:52 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 15:52:17 +0000 (16:52 +0100)
commit6ae131ef235c11d9ff7419b9b84be7132bd25fb5
tree42ab31eb478f860f94d17b5dd7e27d92d4666356
parent75afeed1613ab2ac8e76885c29dff1a28c9b0860
parentddfc0693e99bbc241f4e054ddcba85f0068596fd
Merge remote-tracking branch 'amarx/BUG10693' into next