Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Nov 2013 20:43:02 +0000 (21:43 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Nov 2013 20:43:02 +0000 (21:43 +0100)
commit8cb142e76d95f24c396c8b4cd5ac80ea97aee675
tree15979e79e89576a5b21470ba3cf9511aaeaa004b
parente2fedc9a47aa92b1572f26aeca78da2f922400c7
parent303b81f19c37636402d2e5f850cb683e051bbe10
Merge branch 'master' into next