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

[Fabian Affolter]

commit 52dffefa87c18a24a5ea4bf844ddc5a6240ff894
Merge: 990f932 41d5c9d
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Mon Mar 19 13:17:24 2012 +0100

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

 lshell.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc lshell.spec
index 93d2b1e,8b4df81..cdee286
--- a/lshell.spec
+++ b/lshell.spec
@@@ -15,7 -11,7 +15,7 @@@ BuildRoot:      %{_tmppath}/%{name}-%{v
  BuildArch:      noarch
  
  BuildRequires:  python2-devel
--
++BuildRequires:  python-setuptools
  
  %description
  lshell provides a limited shell configured per user. The configuration
@@@ -57,9 -53,9 +57,12 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Mon Mar 19 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.9.15.1-1
 +- Updated to new upstream version 0.9.15.1
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild