Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 24 Sep 2014 18:39:43 +0000 (20:39 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 24 Sep 2014 18:39:43 +0000 (20:39 +0200)
commita4c895e569730bb73496907c748a18a17b6045be
treed6e7c98e746d58ec25f55d35b5e3510f6f413ad7
parent5aa856ce1cc1375e2a5a21c17411f7be20d57bfe
parentcce37f04afc89e327a9945d08bf447d5188d30a4
Merge branch 'master' into next