Summary of changes:
329c4d5... merge master into f20 (*)
5dd9ab6... using commit 0ff9bc1 for rpm (*)
0004f69... Merge branch 'master' of
ssh://pkgs.fedoraproject.org/docke (*)
b1a0328... Merge branch 'master' into f20
(*) This commit already existed in another branch; no separate mail sent