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

[Tomasz Torcz]

commit 9a991e189614c72b741f0384c264dc95dd3b4486
Merge: f4c2956 0ac973d
Author: Tomasz Torcz <tomek at pipebreaker.pl>
Date:   Sat Jul 27 15:20:27 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/uptimed
    
    Conflicts:
    	uptimed.spec

 uptimed.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc uptimed.spec
index 17c309a,067534b..e84bc0a
--- a/uptimed.spec
+++ b/uptimed.spec
@@@ -2,7 -2,7 +2,7 @@@
  Summary:	A daemon to record and keep track of system up times
  Name:		uptimed
  Version:	0.3.17
--Release:	4%{?dist}
++Release:	5%{?dist}
  License:	GPLv2
  Group:		System Environment/Daemons
  URL:		http://podgorny.cz/moin/Uptimed
@@@ -86,9 -86,9 +86,12 @@@ mkdir -p %{buildroot}%{_localstatedir}/
  %{_includedir}/uptimed.h
  
  %changelog
- * Sat Jul 27 2013 Tomasz Torcz <ttorcz at fedoraproject.org> 0.3.17-4
++* Sat Jul 27 2013 Tomasz Torcz <ttorcz at fedoraproject.org> - 0.3.17-5
 +- use _pkgdocdir (https://fedoraproject.org/wiki/Changes/UnversionedDocdirs)
 +
+ * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.17-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Thu Aug 23 2012 Tomasz Torcz <ttorcz at fedoraproject.org> 0.3.17-3
  - bring systemd unit in-line with upstream (until new version is released)
  - use systemd macros