Merge branch 'master' into text_cutting_bug
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 1 Sep 2010 05:31:40 +0000 (08:31 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 1 Sep 2010 05:31:40 +0000 (08:31 +0300)
commitae2117ec8f7865b8684dd96aed2b034ff082ab76
tree918c2f00e0992b0dc42ef73d8cfd99c08408f7fc
parentfa03eac41ebfa69181871b3c64071bb922498bfb
parent3e6e241ae8335688053422f81c5207ce618f3e9b
Merge branch 'master' into text_cutting_bug
src/ui/friendlistpanel.cpp