Merge branch 'master' of https://git.maemo.org/projects/feedingit
authorYves Marcoz <yves@marcoz.org>
Fri, 6 Jan 2012 00:20:50 +0000 (16:20 -0800)
committerYves Marcoz <yves@marcoz.org>
Fri, 6 Jan 2012 00:20:50 +0000 (16:20 -0800)
commit47a801727a2c1379cfbef49e486bed11de6e3e70
tree1e1dfa01867d0c432619bda22fdb1ec4ed5ef7dc
parentf074d0b619ea66edd13f4301729461f48d16a9a6
parent4f8fb8bde9f6bbdca7a809f88125206bb135e3d8
Merge branch 'master' of https://git.maemo.org/projects/feedingit

Conflicts:
debian/changelog
debian/changelog