]> git.ipfire.org Git - ipfire-2.x.git/commit
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Apr 2016 13:34:16 +0000 (09:34 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Apr 2016 13:34:16 +0000 (09:34 -0400)
commit840c650aa7ae1acbf93e78e7ab9945868d44f6ba
treeb4d981dec9b862ed414c360d93e55c956687ee4f
parentc356c8ce6ae92314e3394f06c3b9e7c30c9681b0
parent1a26eca66eb1c588160ee90211fbd81615b47c11
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next