[filesystem: 2/2] Merge changes

[Ondrej Vasik]

commit ec0bbd694a097ba756cb8dfad73e606f05f1c40b
Merge: f61f9f4 be54575
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Wed Aug 7 11:05:43 2013 +0200

    Merge changes

 filesystem.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc filesystem.spec
index 5247a12,40c0e0c..b89fc68
--- a/filesystem.spec
+++ b/filesystem.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: The basic directory layout for a Linux system
  Name: filesystem
  Version: 3.2
--Release: 18%{?dist}
++Release: 19%{?dist}
  License: Public Domain
  URL: https://fedorahosted.org/filesystem
  Group: System Environment/Base
@@@ -233,9 -234,9 +233,12 @@@ return 
  /var/yp
  
  %changelog
- * Wed Aug 07 2013 Ondrej Vasik <ovasik at redhat.com> - 3.2-18
++* Wed Aug 07 2013 Ondrej Vasik <ovasik at redhat.com> - 3.2-19
 +- drop the ownership of /usr/etc
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-18
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Sun Jun 30 2013 Ondrej Vasik <ovasik at redhat.com> - 3.2-17
  - .dwz symlink is needed as well (#974130)