[dogtail/f19: 4/4] Merge branch 'master' into f19

[Vitezslav Humpa]

commit beecd0967d6f2424f5229af028221566e2c5e877
Merge: 87a915c 5a699cd
Author: Vitezslav Humpa <vhumpa at redhat.com>
Date:   Wed Apr 16 14:43:25 2014 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	dogtail.spec
    	sources

 .gitignore   |    2 ++
 dogtail.spec |    9 +++++++--
 sources      |    3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --cc sources
index 2dadb27,97e5017..78f2347
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
- d5819ed05a394f8f52790387b6511813  dogtail-0.8.2.tar.gz
+ 1184dee60b2609edac863d978c278c0b  dogtail-0.9.0.tar.gz
++