]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
Merge branch 'seventeen' of git.ipfire.org:/pub/git/ipfire-2.x into seventeen
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 4 Nov 2014 19:12:50 +0000 (20:12 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 4 Nov 2014 19:12:50 +0000 (20:12 +0100)
commitb3e7564c40d6228245c9cc570aa49940dfde778f
treefcba317abb8fbd1d05302c471d5ff08126c1dcf0
parentec1e1421861bdf802719ce549540a1110c9cc1a8
parent282c47bcb414319c90f84c958141af4535e99841
Merge branch 'seventeen' of git.ipfire.org:/pub/git/ipfire-2.x into seventeen