Merge branch 'vlp-7' with 'master'
authorRafał Długołęcki <kontakt@dlugolecki.net.pl>
Thu, 1 Aug 2013 21:48:56 +0000 (23:48 +0200)
committerRafał Długołęcki <kontakt@dlugolecki.net.pl>
Thu, 1 Aug 2013 21:48:56 +0000 (23:48 +0200)
commitd51a3585287ecb5d86ea4dfea9acacecb1db208e
treec71873446e98981b645cf3cd8c040e577cb848e4
parentc93d8517f5609af29641b70460f61fb1363f468e
parent2c38d69f82d9b4a14245ebbde7d855b59f0e9848
Merge branch 'vlp-7' with 'master'

Conflicts:
Makefile.am
Makefile.am