From: Yves Marcoz Date: Sat, 15 Oct 2011 16:23:34 +0000 (-0700) Subject: Merge branch 'master' of https://git.maemo.org/projects/feedingit X-Git-Url: https://vcs.maemo.org/git/?p=feedingit;a=commitdiff_plain;h=e98def285bfae38413a810d0d0fc7905a61d4064 Merge branch 'master' of https://git.maemo.org/projects/feedingit --- e98def285bfae38413a810d0d0fc7905a61d4064