Merge branch 'cmake' of git@git.quassel-irc.org:quassel into cmake
authorManuel Nickschas <sputnick@quassel-irc.org>
Tue, 10 Jun 2008 13:49:47 +0000 (15:49 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Tue, 10 Jun 2008 13:49:47 +0000 (15:49 +0200)

Trivial merge