git.ipfire.org Git - ipfire-2.x.git/commit

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Sun, 15 Sep 2013 16:42:33 +0000 (18:42 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Sun, 15 Sep 2013 16:42:33 +0000 (18:42 +0200)
commit	5a6804a2472af03dd6744bb3385408d369659931
tree	c3444248517258609f35e0e56b23fc23c85abd01	tree \| snapshot
parent	7284262a5e94fa4cc15742fa7c7a3a0252d9e9ee	commit \| diff
parent	4accbf93699f6fd76079eb3d75ca82039e01012c	commit \| diff

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen