'jive_messenger_2_1_branch'.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/branches@1403 b35dd754-fafc-0310-a699-88a17e54d16e