From: Florian Forster <octo@verplant.org>
Date: Mon, 11 Sep 2006 21:58:42 +0000 (+0200)
Subject: Merge branch 'encode' into future
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b97df1b3d5be49bc1457409337bb728cef6905b7;p=licom.git

Merge branch 'encode' into future
---

b97df1b3d5be49bc1457409337bb728cef6905b7