Merge branch 'dev' into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 29 Apr 2010 10:24:39 +0000 (13:24 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 29 Apr 2010 10:24:39 +0000 (13:24 +0300)
commita7ee48275c1a14e0fc5710bd49b29ad47b7be53b
tree6829570ec7bd94742d83117d5bb7b3aa11062eac
parent2bbed4c4701ef0c7ccf630fd2925baca4f6e1a86
parent0e7b42f7b38c8543c74f8b7986e722245eda6d13
Merge branch 'dev' into friendlist
src/src.pro