Merge branch 'master' of ssh://drop.maemo.org/git/quicknewsreader
authorTofe <chris.chapuis+gitorious@gmail.com>
Wed, 22 Feb 2012 18:09:22 +0000 (19:09 +0100)
committerTofe <chris.chapuis+gitorious@gmail.com>
Wed, 22 Feb 2012 18:09:22 +0000 (19:09 +0100)
commitf32bf9723848f690d1fcba5945a072ef2d8414a6
treecaf5dc60a9c704dbd158423b1e23f5cd4c12668d
parentfba8f6f66f7884da548bc9da7adc103777c25e07
parentabad6efe52501a07699ac718c955cd92e25031fd
Merge branch 'master' of ssh://drop.maemo.org/git/quicknewsreader