projects / oweals / odhcpd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa3073b 0a41d48)
Merge remote branch 'upstream/master' into bugfixes
authorHans Dedecker <hans.dedecker@technicolor.com>
Thu, 23 Jan 2014 08:49:42 +0000 (09:49 +0100)
committerHans Dedecker <hans.dedecker@technicolor.com>
Thu, 23 Jan 2014 08:49:42 +0000 (09:49 +0100)

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