Merge branches 'master' and 'devel'
commit10e78653c7aa64c007a35189060e69f3f95cba14
authorOndrej Sukup <mimi.vx@gmail.com>
Sat, 3 Oct 2009 10:21:02 +0000 (3 12:21 +0200)
committerOndrej Sukup <mimi.vx@gmail.com>
Sat, 3 Oct 2009 10:21:02 +0000 (3 12:21 +0200)
tree5703669df5c5323925d58f949f3595a119980e86
parent8e79dd42165e47a0da23d30663417c0f17d2873c
parent75ae9a2e96b9a9a4a08b9ce5ba08508d38e944fc
Merge branches 'master' and 'devel'