[SCM] faustworks/master: Resolve merge.

[mira-guest at users.alioth.debian.org]

Imported Upstream version 0.5~repack0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 092101909e018b29f721a47a0bac6aff5ae18cb4
X-Git-Newrev: 51df561bd4be88fb03f87924fc106ff3500fa347

The following commit has been merged in the master branch:
commit 51df561bd4be88fb03f87924fc106ff3500fa347
Merge: 092101909e018b29f721a47a0bac6aff5ae18cb4 9dd266f1bd0884a952040cf891c76894ab76a053
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Jun 4 15:29:56 2014 +0200

    Resolve merge.


-- 
faustworks packaging