[nilfs-utils: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/nilfs-utils

[Eric Sandeen]

commit 0cca90d7893d8dffa9f957947469b3021fa55725
Merge: 9882f9d 79a4d43
Author: Eric Sandeen <sandeen at redhat.com>
Date:   Mon Jan 16 13:36:29 2012 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/nilfs-utils
    
    Conflicts:
    	nilfs-utils.spec

 nilfs-utils.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc nilfs-utils.spec
index 670ae1a,86cd98a..180d978
--- a/nilfs-utils.spec
+++ b/nilfs-utils.spec
@@@ -97,9 -97,9 +97,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_includedir}/nilfs_cleaner.h
  
  %changelog
 +* Mon Jan 16 2012 Eric Sandeen <sandeen at redhat.com> 2.1.1-1
 +- New upstream release
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Wed Nov 30 2011 Eric Sandeen <sandeen at redhat.com> 2.1.0-2
  - Fix up a couple packaging thinkos