Merge branch 'master' of git+ssh://git.codethink.co.uk/git/atspi-dbus
authorMark Doffman <mdoff@silver-wind.(none)>
Tue, 29 Jul 2008 15:02:45 +0000 (16:02 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Tue, 29 Jul 2008 15:02:45 +0000 (16:02 +0100)
commit58b918b6ec378d94aa0bce5685ff0aaa1d761615
tree231d304626d477b096c329816006991c30abb0f3
parent9f1e72aa346b872b32ffad45a5fe48515a4822e9
parent40b6c7667bf9b259c044c0cd7a959eede44a5f3c
Merge branch 'master' of git+ssh://git.codethink.co.uk/git/atspi-dbus