Merge branch 'p2p-telepathy' of git@gitorious.org:miniature/miniature into p2p-telepathy
authorDariusz Mikulski <dariusz.mikulski@collabora.co.uk>
Thu, 4 Mar 2010 16:31:31 +0000 (17:31 +0100)
committerDariusz Mikulski <dariusz.mikulski@collabora.co.uk>
Thu, 4 Mar 2010 16:31:31 +0000 (17:31 +0100)
commitfbed408bf42eb446ecdf6b5ab4c44660d56d056e
treee41e66cf1e3159dd258728eb6b674ea0e64da981
parent026f9e4468a9f405aacdfe60110093674c90804f
parentdfc3fbc436960093d2da275c1f8b090358a0df19
Merge branch 'p2p-telepathy' of git@gitorious.org:miniature/miniature into p2p-telepathy
Makefile.am