From: Thomas Hochstein <thh@inter.net>
Date: Fri, 7 Oct 2011 10:30:21 +0000 (+0200)
Subject: Merge branch 'update'
X-Git-Tag: 2.0.0.-pre1
X-Git-Url: https://code.th-h.de/?p=faqs%2Fdnq-faq.git;a=commitdiff_plain;h=4b8a7a66d348e483744187a1545f7ca36ea3b95c;hp=--cc

Merge branch 'update'

Conflicts:
	dnq-faq (last-modified)

Signed-off-by: Thomas Hochstein <thh@inter.net>
---

4b8a7a66d348e483744187a1545f7ca36ea3b95c