Merge branch 'bacula' of github.com:morlix/ipfire-2.x into bacula
authorTimo Eissler <timo@eissler.pro>
Tue, 15 Jul 2014 19:12:51 +0000 (21:12 +0200)
committerTimo Eissler <timo@eissler.pro>
Tue, 15 Jul 2014 19:12:51 +0000 (21:12 +0200)
Conflicts:
make.sh


Trivial merge