Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 May 2015 07:44:03 +0000 (09:44 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 May 2015 07:44:03 +0000 (09:44 +0200)
commit0ed7b61325996686b956ba398ccb830b53253253
tree21d3233dc73cf77691112d235223fa58c499475c
parentdcca805182bef76740752aa90542362806eaa47f
parent5ea73f56601411d842456243fc88bdde8834742c
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next