From: Christian Weiske <cweiske@cweiske.de>
Date: Tue, 1 Nov 2011 05:42:00 +0000 (+0100)
Subject: Merge branch '0.98'
X-Git-Tag: v0.98.6~69
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=db6011331290fcbe453b3f5b5560c59f60c4ee34;p=semanticscuttle.git

Merge branch '0.98'

Conflicts:
	doc/ChangeLog
---

db6011331290fcbe453b3f5b5560c59f60c4ee34