From: Yves Marcoz Date: Mon, 19 Sep 2011 23:07:06 +0000 (-0700) Subject: Merge branch 'master' of https://git.maemo.org/projects/feedingit X-Git-Url: http://vcs.maemo.org/git/?p=feedingit;a=commitdiff_plain;h=ef4aa65a014014fa32b32fd1ffdcab07b78597a6 Merge branch 'master' of https://git.maemo.org/projects/feedingit --- ef4aa65a014014fa32b32fd1ffdcab07b78597a6