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

author	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 11 Aug 2013 11:32:51 +0000 (13:32 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 11 Aug 2013 11:32:51 +0000 (13:32 +0200)
commit	9ff0db36c130cced27b667ac6b8ef8d423882380
tree	1ac752d38f84602e190398006417e51b5646d952	tree \| snapshot
parent	3b5b44904748a923e0555ad929608f642574adb3	commit \| diff
parent	7a6bb67a6be2c51053d6a1a432926f7231ba23e8	commit \| diff

Merge remote-tracking branch 'ummeegge/wavemon' into next

Conflicts:
make.sh