From: Christian Pulvermacher <pulvermacher@gmx.de>
Date: Wed, 1 Feb 2012 22:36:35 +0000 (+0100)
Subject: Merge branch 'master' of https://vcs.maemo.org/git/presencevnc
X-Git-Tag: 0.8~11
X-Git-Url: http://git.maemo.org/git/?p=presencevnc;a=commitdiff_plain;h=aedad407c23be9b6878fe5ebc1784264054258bf

Merge branch 'master' of https://vcs.maemo.org/git/presencevnc
---

aedad407c23be9b6878fe5ebc1784264054258bf