[arduino: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/arduino

[mavit]

commit 6c82aff2f3e6fd3bbd24322b923c67c3c35ea7b3
Merge: 3e0e4bb d1ce762
Author: Peter Oliver <git at mavit.org.uk>
Date:   Sun Jul 22 20:52:20 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/arduino

 arduino.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc arduino.spec
index e9cfc50,31fbceb..723d351
--- a/arduino.spec
+++ b/arduino.spec
@@@ -191,10 -191,9 +191,13 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 +* Sun Jul 22 2012 Peter Oliver <rpm at mavit.org.uk> - 1:1.0.1-1
 +- Update to 1.0.1.
 +- Compress source with xz.
 +
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri May  4 2012 Peter Oliver <rpm at mavit.org.uk> - 1:1.0-4
  - Pass version number to "ant build" (fixes #815079).