[opendnssec/f20] (5 commits) ...Merge branch 'master' into f20

[Paul Wouters]

Summary of changes:

  4156dee... * Tue Apr 01 2014 Paul Wouters <pwouters at redhat.com> - 1.4. (*)
  70b73e5... * Fri Apr 18 2014 Paul Wouters <pwouters at redhat.com> - 1.4. (*)
  7a79b22... add changelog entry (*)
  53c15c3... fix patch number (*)
  7e10d70... Merge branch 'master' into f20

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