Merge pull request #42 from sezuan/2.1.x

2.1.x

diff --cc src/mod_pubsub/mod_pubsub.erl
Simple merge

diff --cc src/mod_pubsub/node_hometree.erl
Simple merge

diff --cc src/mod_pubsub/pubsub.hrl
Simple merge

diff --cc src/mod_pubsub/pubsub_subscription.erl
Simple merge