[dvtm/f21: 2/2] Merge branch 'master' into f21

[Petr Šabata]

commit 8bdd3a10610d71fb826d60af79437735c1c022ba
Merge: 1d36d3f 4c0c3b9
Author: Petr Šabata <contyk at redhat.com>
Date:   Fri Feb 20 11:55:28 2015 +0100

    Merge branch 'master' into f21

 .gitignore                                     |  1 +
 dvtm-0.13-build.patch => dvtm-0.14-build.patch | 16 ++++++++--------
 dvtm.spec                                      |  7 +++++--
 sources                                        |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)
---