Merge remote-tracking branch 'refs/remotes/origin/master'

9204d1f5 · Michal 'vorner' Vaner · e41be59e · c077699f · 9204d1f5
Commit 9204d1f5 authored May 17, 2013 by Michal 'vorner' Vaner
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

ChangeLog ChangeLog +4 -3

No files found.
--- a/ChangeLog
+++ b/ChangeLog
 614.	[func]		tmark
-	b10-d2: Initial DHCP-DDNS (a.k.a. D2) module implemented. Currently it does
-	nothing useful, except for providing the skeleton implementation 
-	to be expanded in the future.
+	b10-d2: Initial DHCP-DDNS (a.k.a. D2) module implemented.
+	Currently it does nothing useful, except for does nothing useful,
+	except for providing the skeleton implementation to be expanded in
+	the future.
 	(Trac #2954, git 392c5ec5d15cd8c809bc9c6096b9f2bfe7b8c66a)

 613.	[func]		jinmei