Viewing all changes in revision 2639.

Committer: Simon McVittie
Date: 2012-06-28 15:50:23 UTC
mfrom: <a title="Merged From 2626.1.24" href="/~jamesodhunt/dbus/create-connection-from-fd/revision/2626.1.24">(2626.1.24)
Revision ID: git-v1:0c40800505899f20946ad59317d28e0e5a25ad41

Merge branch 'dbus-1.6'

Conflicts:
NEWS
configure.ac

added added

removed removed