Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Sun, 4 Oct 2009 16:18:23 +0000 (16:18 +0000)
committerStef Walter <stef@memberwebs.com>
Sun, 4 Oct 2009 16:18:23 +0000 (16:18 +0000)
commitc286a2003c6e3d874eb720e9d9bc59ea62d8bdbf
tree3202cd77147352259614b470561b4f580491060c
parent6d35d961607c02a6cec43dd69b28e5b87d12c10f
parent8a14f5930839daa7d21b42774c4b2ab068dbc919
Merge branch 'master' into dbus-api