[rabbitmq-server/el6/master] (2 commits) ...Merge branch 'master' into el6

[Hubert Plociniczak]

Summary of changes:

  359031b... New upstream release 2.2.0 (*)
  60b5e94... Merge branch 'master' into el6

(*) This commit already existed in another branch; no separate mail sent