[libsvm/f21: 5/5] Merge branch 'f21' of ssh://pkgs.fedoraproject.org/libsvm into f21

[Ding-Yi Chen]

commit 5c828410c387d83d4c8cd2c3b6d2bebee0a267e4
Merge: c8e73cd e82ed31
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jan 20 14:28:54 2015 +1000

    Merge branch 'f21' of ssh://pkgs.fedoraproject.org/libsvm into f21
    
    Conflicts:
    	libsvm.spec

 libsvm.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --cc libsvm.spec
index 2c0b755,660043b..01fc8f7
--- a/libsvm.spec
+++ b/libsvm.spec
@@@ -583,3 -537,3 +583,4 @@@ rm -rf %{buildroot
  * Fri Aug 17 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-0
  - initial packaging
  
++