Merge branch 'master' of origin
authorSam Thursfield <samthursfield@codethink.co.uk>
Wed, 29 Jun 2011 17:06:30 +0000 (18:06 +0100)
committerSam Thursfield <samthursfield@codethink.co.uk>
Wed, 29 Jun 2011 17:06:30 +0000 (18:06 +0100)
commit49c72aed15f8dbdda3b71a59031061c44a4f8ee4
tree0129d913e5a85e707a31ec87875f529acecf5c4e
parent7a7a5b1d0d85d6b265baea50ec953ca3a6061d4e
parent555b1f5aa8b35b6cb12be2d318d286899992d808
Merge branch 'master' of origin

Conflicts:
Makefile.am
src/moonshot-dbus-server.vala
src/moonshot-msrpc-server.vala
src/moonshot-server.vala