From: Rafał Długołęcki <kontakt@dlugolecki.net.pl>
Date: Thu, 1 Aug 2013 21:48:56 +0000 (+0200)
Subject: Merge branch 'vlp-7' with 'master'
X-Git-Tag: 3.1~4
X-Git-Url: https://git.dlugolecki.net.pl/?p=vlp.git;a=commitdiff_plain;h=d51a3585287ecb5d86ea4dfea9acacecb1db208e

Merge branch 'vlp-7' with 'master'

Conflicts:
	Makefile.am
---

d51a3585287ecb5d86ea4dfea9acacecb1db208e