Merge branch 'master' into todd_prdr
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 6 Jan 2013 13:34:22 +0000 (13:34 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 6 Jan 2013 13:34:22 +0000 (13:34 +0000)
commit0e018d4b7b8c3b84df08163a0659f4fc67fdf46c
tree57c6e5cf028d29cd62becaeb16d9d0545f17efc3
parent5f79c12257b77a649637171f833a3903e9115ea1
parent2a47f02825993e5ade191f8206cb767b0d9fc44c
Merge branch 'master' into todd_prdr
src/src/deliver.c
src/src/globals.c
src/src/globals.h