[python-uinput/f20: 2/2] Merge branch 'master' into f20

[Fabian Deutsch]

commit 42cca7ed60e02988dc44c9ea329084b0d4bc01ce
Merge: 949bf64 9c4de93
Author: Fabian Deutsch <fabiand at fedoraproject.org>
Date:   Fri Feb 28 17:03:46 2014 +0100

    Merge branch 'master' into f20
    
    Conflicts:
    	python-uinput.spec

 python-uinput.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc python-uinput.spec
index 47e008f,66fd042..2619c93
--- a/python-uinput.spec
+++ b/python-uinput.spec
@@@ -93,9 -95,9 +95,12 @@@ chmod a-x examples/
  
  
  %changelog
+ * Fri Feb 28 2014 Fabian Deutsch <fabiand at fedoraproject.org> - 0.10.1-1
+ - Update to latest upstram
+ 
 +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +
  * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild