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

author	Michael Tremer <michael.tremer@ipfire.org>
	Sat, 26 Jul 2014 19:34:45 +0000 (21:34 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sat, 26 Jul 2014 19:34:45 +0000 (21:34 +0200)
commit	cc7411e791f5e2d6ae807f1dae6f1711fc4c1b1b
tree	1e57fadb5b7cfcf66d8d7ee1dd29fa45cbbf3f6c	tree \| snapshot
parent	32e799902dce517f39cf1131a870bd544923b14f	commit \| diff
parent	f76c78222f8c972dff9282729467b6bd65f4c24a	commit \| diff

Merge remote-tracking branch 'morlix/bacula' into next

Conflicts:
make.sh