Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 11 Jun 2015 12:30:44 +0000 (14:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 11 Jun 2015 12:30:44 +0000 (14:30 +0200)
commita26a1e16983dbcfc3dd73ab2cddd1fce69223134
tree33ebea8bcdc7d47a0ab3bcef805163cb5dc275cf
parente36af11945c8217a2bc957e42aa87c6578ab573e
parent36215f793fd455c1721844ee95a535b19636d1d5
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next