[openlmi-providers/f17: 6/6] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/openlmi-providers into f17

[Radek Novacek]

commit 4822102204ebd6ef8d162fa874ea959834b6e81f
Merge: b522c94 4a10414
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Tue Nov 13 09:17:07 2012 +0100

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/openlmi-providers into f17
    
    Conflicts:
    	.gitignore
    	openlmi-providers.spec
    	sources

 openlmi-providers.spec |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --cc openlmi-providers.spec
index 53a55dd,74e9727..cd8837c
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@@ -354,11 -320,8 +354,8 @@@ f
  - Requires fixed konkretcmpi >= 0.8.7-7
  
  * Thu Oct 25 2012 Roman Rakus <rrakus at redhat.com> - 0.0.12-1
 -- Update to version 0.0.12
 +- Version 0.0.12
  
- * Thu Oct 25 2012 Michal Minar <miminar at redhat.com> 0.0.11-1
- - Version 0.0.11
- 
  * Thu Oct 25 2012 Radek Novacek <rnovacek at redhat.com> 0.0.10-2
  - Remove %isa from obsoletes