Merge branch 'mob' of git+ssh://repo.or.cz:22/srv/git/centerim into mob
commitd2e6178c121e13c4046a19a3db66aae039a81307
authorRoger <roger@jikos.cz>
Tue, 19 Oct 2010 12:02:10 +0000 (19 14:02 +0200)
committerRoger <roger@jikos.cz>
Tue, 19 Oct 2010 12:02:10 +0000 (19 14:02 +0200)
tree42886ad381f7c099068c29c740b44e13f791d264
parent0ac5dd42868d46d02d0c30490c27e44acc710078
parent47c2b979c40ea2b957f75a4478929d7fb626b940
Merge branch 'mob' of git+ssh://repo.or.cz:22/srv/git/centerim into mob