projects / oweals / odhcpd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84cfd09 d59daa0)
Merge remote branch 'upstream/master' into bugfixes
authorHans Dedecker <hans.dedecker@technicolor.com>
Thu, 16 Jan 2014 10:33:34 +0000 (11:33 +0100)
committerHans Dedecker <hans.dedecker@technicolor.com>
Thu, 16 Jan 2014 10:33:34 +0000 (11:33 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.