[SCM] UNNAMED PROJECT branch, master, updated. debian/1.1.0-1-14-gaa122a8

[Jakub Adam]

The following commit has been merged in the master branch:
commit f51cce92211fa9d1b4df445598047dbd611b1aba
Merge: 5f0aa0564b88ad8e722c1b35ad254c9977e7db06 bf45f07aa8529a72308a0b5b17c61b8d81bd99ae
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Dec 23 21:12:56 2011 +0100

    Merge commit 'upstream/1.2.0'


-- 
UNNAMED PROJECT