From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Mon, 28 Apr 2014 14:15:18 +0000 (+0200)
Subject: Merge branch 'master' of ssh.alwaysdata.com:www/diary-mobile-android
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=2473f3bdb8551860c267f313956e923cd19a0c7a;p=diary-mobile.git

Merge branch 'master' of ssh.alwaysdata.com:www/diary-mobile-android

Conflicts:
	mainwindow.cpp
---

2473f3bdb8551860c267f313956e923cd19a0c7a