Merge remote branch 'upstream/master'
authorroot <root@localhost>
Thu, 2 Feb 2012 21:44:45 +0000 (22:44 +0100)
committerroot <root@localhost>
Thu, 2 Feb 2012 21:44:45 +0000 (22:44 +0100)
commitfffe459760943b6ed8e0bb736c87ef424ce38fdc
treeaa12bc628316de24cdcb3b151404a44566456eb8
parentc253a006e0eafc173752e7c77dd706e02073cd20
parent4e6b0e24b2f4b6e00df70bd5c2badda8d56fab77
Merge remote branch 'upstream/master'

Conflicts:
src/proto-p10.c
configure.in
src/proto-bahamut.c
src/proto-common.c
src/proto-p10.c
src/proto.h