Merge branch 'mob' of git+ssh://repo.or.cz/srv/git/siplcs into mob
commit82b58f29691f1657cc37d7355e1289fd0d6e2738
authorStefan Becker <stefan.becker@nokia.com>
Mon, 19 Apr 2010 19:44:29 +0000 (19 22:44 +0300)
committerStefan Becker <stefan.becker@nokia.com>
Mon, 19 Apr 2010 19:44:29 +0000 (19 22:44 +0300)
treefb8a3c5e55450719f49d97d552dd66a52840d6e4
parent1bc7b9849e74c36791b936e11dcf18df3e1749d8
parent2285c86a0ee6ae99e8ec2de3cf87dbe642de4651
Merge branch 'mob' of git+ssh://repo.or.cz/srv/git/siplcs into mob
src/api/sipe-core.h
src/core/sipe.c
src/purple/purple-plugin.c