From: Christian Weiske <cweiske@cweiske.de>
Date: Mon, 1 Aug 2011 17:58:39 +0000 (+0200)
Subject: Merge branch '0.98'
X-Git-Tag: v0.98.6~87
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8216ae476c25960f0480233c35af9feb257563a5;p=semanticscuttle.git

Merge branch '0.98'

Conflicts:
	doc/ChangeLog
---

8216ae476c25960f0480233c35af9feb257563a5