[freeDiameter/f19] (5 commits) ...Merge branch 'master' into f19

[Filipe Rosset]

Summary of changes:

  7352499... Updated to 1.1.6. (*)
  a6759d5... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  2fb752b... new upstream version 1.2.0 (*)
  f55e621... new upstream version 1.2.0 (*)
  64da7c5... Merge branch 'master' into f19

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