Merge branch 'master' of ssh://dev.psi-im.org/home/psi/git/psi
commitca7bd7bfe6f7c6d0c1e7bd729d84e11ff93032bf
authorrion <rion@skydns.ru>
Mon, 14 Nov 2011 05:54:12 +0000 (14 10:54 +0500)
committerrion <rion@skydns.ru>
Mon, 14 Nov 2011 05:54:12 +0000 (14 10:54 +0500)
treea2ed5f1bed4205d70367ece0ab92399c455e28bb
parentfcc44d09bb48034ef4761ead761b193a605e92c2
parent9da41d626028dabd4781057cc2d4d061d0bc33c7
Merge branch 'master' of ssh://dev.psi-im.org/home/psi/git/psi