git.ipfire.org Git - people/stevee/network.git/commit

author	Michael Tremer <michael.tremer@ipfire.org>
	Mon, 14 Nov 2011 13:55:03 +0000 (14:55 +0100)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Mon, 14 Nov 2011 13:55:03 +0000 (14:55 +0100)
commit	8ab1debd8941c36735fbf2cb6d7bc4fae981b162
tree	5fd3abd4116313363fc5c3b133f58c720b521786	tree \| snapshot
parent	a162ca8ce3354887548f17e64ce02ae44b5a5ffe	commit \| diff
parent	32b5856820dc10a14905bf2c62dbfc17ecb7a7e8	commit \| diff

Merge branch 'master' of ssh://git.ipfire.org/pub/git/network

Conflicts:
Makefile