Merge branch 'seezer'
authorManuel Nickschas <sputnick@quassel-irc.org>
Tue, 1 Jul 2008 18:14:39 +0000 (20:14 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Tue, 1 Jul 2008 18:14:39 +0000 (20:14 +0200)
commitbf01681e9e6108517bfa997422b84e04b801a40a
tree592ebc2e207c65fb6914bb27a7ea5d3a0a79e618
parent6ad19e08fcfcf299f7c7746de01a2b1c7d1b6974
parent9f923167f8c8bdadf24f41ab02ae478123f83caa
Merge branch 'seezer'