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

author	Michael Tremer <michael.tremer@ipfire.org>
	Mon, 24 Jun 2013 08:36:21 +0000 (10:36 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Mon, 24 Jun 2013 08:36:21 +0000 (10:36 +0200)
commit	bca7488392f50882571118a969d804d377d9b3dd
tree	cfefe01d53d348c94cc7727491a0840d82bce293	tree \| snapshot
parent	f3d1635fdddcdf6ac4f199dc041fa06ea7427d49	commit \| diff
parent	85981472c3ef260141178afe9a006935ecb913e2	commit \| diff

Merge remote-tracking branch 'jlentfer/swatch' into next

Conflicts:
make.sh