Merge branch 'master' into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 20 May 2010 07:14:11 +0000 (10:14 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 20 May 2010 07:14:11 +0000 (10:14 +0300)
commit29f85e5649df6c5a1805e4905061b86f1046fd95
tree1b10d23276c8bf751849cc7952f3cf2afcbc2048
parent18081472bafe19477bfdb0ee25c4c3e28b074c05
parent27bf5947e07aed8807684f8bdb49ebbee6c4af34
Merge branch 'master' into friendlist