Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Thu, 8 May 2014 17:40:14 +0000 (21:40 +0400)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Thu, 8 May 2014 17:40:14 +0000 (21:40 +0400)
commitb995178e30c2d4b15b1f026ceb50b5f92549a42d
tree4c1d82c9a8b4b3fcb350e66b1640902031d7a188
parent181e7a823e73140fc67db4acbcedd2567f079a12
parent0716a8cdae5df3f47152bc26d5b1bc66dd508277
Merge branch 'master' of github.com:processone/ejabberd