git.ipfire.org Git - thirdparty/pdns.git/commit

]> git.ipfire.org Git - thirdparty/pdns.git/commit

author	Ruben d'Arco <cyclops@prof-x.net>
	Sun, 19 May 2013 09:13:52 +0000 (11:13 +0200)
committer	mind04 <mind04@monshouwer.org>
	Fri, 12 Jul 2013 15:29:28 +0000 (17:29 +0200)
commit	9f44333aaab93dc5cb3ec60dc4a9b13b4307c8b7
tree	da91ca8bc611af24d01b492b96b4da81749f2cc7	tree \| snapshot
parent	1d78f27eabba55a7c8ccee221406956e4001574a	commit \| diff

Fix rebase conflicts failures

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