From: Vlad <vlad@gas.by>
Date: Fri, 20 Aug 2010 11:38:12 +0000 (+0300)
Subject: Merge branch 'master' of https://vcs.maemo.org/git/shermanaquarium
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=953dbe41c277a2abf4509aa54956f8bd056a8997;hp=d144dca98317093ceaf0cdcfb1c3d37ffc94be75;p=shermanaquarium

Merge branch 'master' of https://vcs.maemo.org/git/shermanaquarium
---