Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 10 Jul 2014 17:17:45 +0000 (19:17 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 10 Jul 2014 17:17:45 +0000 (19:17 +0200)
commit510e4cc9c184adc0a58624a9b3c15181c1f38dfb
tree7e6de7131c13dde3ebb173881cd8c31f8a5ece15
parentdc188082d576106e6877735f0e858e6f05f041db
parentbfdab6e3644fef33b22dfcf10e641ebdf8b55367
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next