From: Fredrik Wendt <fredrik@wendt.se>
Date: Wed, 9 Jun 2010 20:09:56 +0000 (+0100)
Subject: Merge branch 'master' of git@wendt.se:hermes
X-Git-Tag: 0.8.0~14^2~3
X-Git-Url: https://vcs.maemo.org/git/?p=hermes;a=commitdiff_plain;h=5e6ad605b54061576512ece44c3bf87d169b789c

Merge branch 'master' of git@wendt.se:hermes
---

5e6ad605b54061576512ece44c3bf87d169b789c