From: Jakub Steiner <jimmac@gmail.com>
Date: Sat, 29 Nov 2008 21:59:06 +0000 (+0100)
Subject: Merge branch 'master' of git@github.com:jimmac/original
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2ed7f015ee8c76d4ee4a483240f7041b8f18972c;p=original.git

Merge branch 'master' of git@github.com:jimmac/original

* 'master' of git@github.com:jimmac/original:
---

2ed7f015ee8c76d4ee4a483240f7041b8f18972c