]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1164cb0 c63e97b)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Apr 2015 19:58:09 +0000 (21:58 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Apr 2015 19:58:09 +0000 (21:58 +0200)
Conflicts:
lfs/monit


Trivial merge
IPFire 2.x development tree