Merge branches 'master' and 'devel'
commitdc9a14eb6f1dbb3db3bc832aec3ae86dfddebf52
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
parent9c68e2cf022fdad43b40ab3b5b93a0ecd6eba91d
Merge branches 'master' and 'devel'