Merge branch 'mob' into private-chatid-rework
commit496500b7ab5dd982db88c273c89570da3e514313
authorStefan Becker <stefan.becker@nokia.com>
Fri, 8 Oct 2010 05:33:32 +0000 (8 08:33 +0300)
committerStefan Becker <stefan.becker@nokia.com>
Fri, 8 Oct 2010 05:33:32 +0000 (8 08:33 +0300)
treebe74e81e007f4be7c68779901f030cd436428a58
parentb2fe1540edc7b93a2dff4a3e1f379587879ceb32
parent651335030128c97160495014c6c7149ab17d0345
Merge branch 'mob' into private-chatid-rework
src/api/sipe-backend.h
src/api/sipe-core.h
src/core/sipe-core.c
src/core/sipe.c
src/purple/purple-plugin.c
src/purple/purple-private.h