[0ad/f21: 2/2] Merge branch 'master' into f21

[pcpa]

commit 0e5555bd3c77042047d60a25528351087d820bda
Merge: eadf3ac 2ed0214
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date:   Sun Oct 12 16:22:43 2014 -0300

    Merge branch 'master' into f21

 .gitignore           |    1 +
 0ad-debug.patch      |   36 ++-
 0ad-licensecheck.txt |  883 +++++++++++++++++++++++++++++++++-----------------
 0ad-miniupnpc.patch  |   12 -
 0ad-rpath.patch      |    7 +-
 0ad-valgrind.patch   |    8 +-
 0ad.6                |   70 +++--
 0ad.spec             |   40 +--
 changeset_15334.diff |   42 ---
 sources              |    2 +-
 10 files changed, 667 insertions(+), 434 deletions(-)
---