[plasma-mediacenter/f20: 3/3] Merge branch 'master' into f20

[siddharths]

commit ee2dc8f23e3ffa982459e4805baad7904411170d
Merge: e970100 220646c
Author: Siddharth Sharma <siddharth.kde at gmail.com>
Date:   Wed Jul 2 15:41:27 2014 +0530

    Merge branch 'master' into f20

 .gitignore                                        |    1 +
 0001-include-translations-sub-directory.patch     |   23 --
 plasma-mediacenter-1.3.0-1.fc21.src.rpm           |  Bin 0 -> 455328 bytes
 plasma-mediacenter.spec                           |   16 +-
 results_plasma-mediacenter/1.3.0/1.fc21/build.log |    1 +
 results_plasma-mediacenter/1.3.0/1.fc21/root.log  |  264 +++++++++++++++++++++
 results_plasma-mediacenter/1.3.0/1.fc21/state.log |   10 +
 sources                                           |    2 +-
 8 files changed, 285 insertions(+), 32 deletions(-)
---