Merge branch 'master' into dbus
authorSteve Youngs <steve@sxemacs.org>
Sat, 28 Jan 2012 13:56:28 +0000 (23:56 +1000)
committerSteve Youngs <steve@sxemacs.org>
Sat, 28 Jan 2012 13:56:28 +0000 (23:56 +1000)
commitf922deb15970dbe7a23b7d0a4d313a56a6a7005d
tree7b0f2b08966bfe66b8f5fa1844c020351dae81fc
parent571fb34cc9594d364a3a92c30568f3643cc95f6e
parenta17da6cfe6279dbd4ad4a1ba618f862edb2da6fc
Merge branch 'master' into dbus

Conflicts:
modules/dbus/Makefile.am  Trivial, resolved.

Signed-off-by: Steve Youngs <steve@sxemacs.org>
configure.ac
modules/Makefile.am
modules/dbus/Makefile.am
src/elhash.c