From: Tomas Musil <tomik.musil@gmail.com>
Date: Mon, 2 Apr 2012 13:28:47 +0000 (+0200)
Subject: merge
X-Git-Url: http://git.tomasm.cz/krypto.git/commitdiff_plain/d57f411cc12d3006a9a90c03e01fe7b3cfa54446

merge
---

d57f411cc12d3006a9a90c03e01fe7b3cfa54446