Merge branches 'master' and 'devel'
commitacde23c1f56f6663b0aa8dbb11c3737b797ccc94
authorOndrej Sukup <mimi.vx@gmail.com>
Mon, 14 Dec 2009 12:34:41 +0000 (14 13:34 +0100)
committerOndrej Sukup <mimi.vx@gmail.com>
Mon, 14 Dec 2009 12:34:41 +0000 (14 13:34 +0100)
tree20b7f9e89d189633b892d561799459d75f129eb9
parentfc024691acc8fba450dec7f3505d4ad946db2963
Merge branches 'master' and 'devel'