Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 9 Jul 2015 11:16:45 +0000 (13:16 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 9 Jul 2015 11:16:45 +0000 (13:16 +0200)
commitc972b1c467ee3babf60fab4e1b23f72cc7eade74
tree6ceb48bec6975bde1adaafce47f223271153d855
parentec2285c8113461f7fedb3fde549d76b3f5e40800
parent8c8383e55ee881651ccf201d117235b7b51b69c4
Merge branch 'master' into next