]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 008c392 469f20c)
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
IPFire 2.x development tree