From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Sat, 24 May 2014 07:41:16 +0000 (+0200)
Subject: Merge branch 'master' of ssh.alwaysdata.com:git/diary-mobile
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=854fac7333060fbf5680b57e4c4d69f4dda56fca;p=diary-mobile.git

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

Conflicts:
	mainwindow.cpp

merge ?
---

854fac7333060fbf5680b57e4c4d69f4dda56fca