Merge branch 'master' into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 24 May 2010 06:59:35 +0000 (09:59 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 24 May 2010 06:59:35 +0000 (09:59 +0300)
commit9fe818d6378808e792cb544d862300b66573d610
treeb85b6d02546f19d6761691521cb01405d2cbe1f6
parent8e110d39fff0e3cefd28a087656ee03153d228ab
parenta083d1c17730e3651357174ed66fde5f7d5a63ba
Merge branch 'master' into friendlist