Merge remote branch 'pwith/docs'
authorTravis Reitter <travis.reitter@collabora.co.uk>
Thu, 24 Jun 2010 15:22:33 +0000 (08:22 -0700)
committerTravis Reitter <travis.reitter@collabora.co.uk>
Thu, 24 Jun 2010 15:22:33 +0000 (08:22 -0700)
commit5adecc4f4b2c022750f5a7fb001363b95260ae41
tree3f3fbec7c5d564420e8d8bcfa2372b86d59b394a
parentb0711d037ceed7438c572fcd2f3a2a4faff6cc73
parentad13c581213a1979d4b9ce7600e4056ec16b45e4
Merge remote branch 'pwith/docs'

(Fixed)
Conflicts:
folks/individual-aggregator.vala
folks/persona-store.vala
configure.ac
folks/individual-aggregator.vala
folks/individual.vala
folks/persona-store.vala
folks/presence.vala