]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
Merge branch 'master' of git.ipfire.org:/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Jan 2015 13:42:30 +0000 (14:42 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Jan 2015 13:42:30 +0000 (14:42 +0100)
commit9692499b2a87f1bdcebd8e1fd8e4f40084c898ba
treeb993398104226cc02d2cb6b1e239342f38096465
parenta91fd50d80dffb610cc2a6d5d31a9ee1b6a0d37d
parent214cc7b19528774eebc43e82d9c94c5e4592bc39
Merge branch 'master' of git.ipfire.org:/pub/git/ipfire-2.x