[bcfg2: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/bcfg2

[Fabian Affolter]

commit a3849d2dfd7e21f7e60bb74cf2f98b28276c02b4
Merge: 1f68a10 adcf263
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Sun Mar 20 17:19:02 2011 +0100

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

 bcfg2.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc bcfg2.spec
index cb76ce7,7b5209b..c6a5852
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@@ -253,15 -225,10 +253,18 @@@ f
  
  %dir %{_var}/lib/bcfg2
  
 +%files doc
 +%defattr(-,root,root,-)
 +%doc %{_defaultdocdir}/bcfg2-doc-%{version}%{?_pre:pre%{_pre}}
 +
  %changelog
 +* Sun Mar 20 2011 Fabian Affolter <fabian at bernewireless.net> - 1.2.0-1.1.pre1
 +- Added doc subpackage
 +- Updated to new upstream version 1.2.0pre1
 +
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2.1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Thu Nov 18 2010 Fabian Affolter <fabian at bernewireless.net> - 1.1.1-2
  - Added new man page
  - Updated doc section (ChangeLog is gone)