Merge commit '96ce6d6f119a16e489941c629a2805204322b717'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Aug 2014 19:07:05 +0000 (21:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Aug 2014 19:41:55 +0000 (21:41 +0200)
commiteb706575baa646d3d2400d85a521386a4df3d979
treeb2f98bfd8d68d6282747e7847574ccec3a71d04f
parent3d40ba3d81276c659191b0de9653e9ec69c090f1
parent96ce6d6f119a16e489941c629a2805204322b717
Merge commit '96ce6d6f119a16e489941c629a2805204322b717'

* commit '96ce6d6f119a16e489941c629a2805204322b717':
  doc: Add more information in the README

Conflicts:
README.md

Merged-by: Michael Niedermayer <michaelni@gmx.at>
README.md