]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a8673c dd0259e)
Merge branch 'dma-systemd' of git://git.ipfire.org/people/stevee/ipfire-3.x into dma dma
authorAlexander Marx <alexander.marx@ipfire.org>
Wed, 11 Nov 2015 10:18:43 +0000 (11:18 +0100)
committerAlexander Marx <alexander.marx@ipfire.org>
Wed, 11 Nov 2015 10:18:43 +0000 (11:18 +0100)

Trivial merge
Alex's tree of IPFire 3.x