projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 180fffd 03189f6)
Merge branch 'nfs-utils-update' into core67-merge
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:59:05 +0000 (13:59 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:59:05 +0000 (13:59 +0100)

Trivial merge
Timo's tree of IPFire 2.x