Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 1 Feb 2014 12:38:58 +0000 (13:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 1 Feb 2014 12:38:58 +0000 (13:38 +0100)
commita20395a645d73a74825693e8d9cbb411a5b3cfcf
treed2b0d1e0bde1a6b48139e8d9acce8eb274c62e8a
parent3ebf8d1b011d7b4346306e150b2cda21c28ceea5
parentff740a733c7374010e10afb63dbba45c8a7ba042
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next