Merge branch 'cover'
authorNikolay Tischenko <niktischenko@gmail.com>
Sun, 31 Oct 2010 21:02:01 +0000 (03:02 +0600)
committerNikolay Tischenko <niktischenko@gmail.com>
Sun, 31 Oct 2010 21:02:01 +0000 (03:02 +0600)
Conflicts:
src/clickablelabel.cpp


Trivial merge