From: Andre Noll <maan@systemlinux.org>
Date: Thu, 22 Aug 2013 17:07:45 +0000 (+0200)
Subject: Merge branch 't/dia'
X-Git-Tag: v0.5.0~6
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=79d6515d49cdb0a91ff7c4a599f2d63cb5678032;hp=79d6515d49cdb0a91ff7c4a599f2d63cb5678032;p=paraslash.git

Merge branch 't/dia'

Was cooking since 2013-06-07.

	f5fb7a Overview: Add new slides, powered by dia.
---