From 5c828410c387d83d4c8cd2c3b6d2bebee0a267e4 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Jan 20 2015 04:28:54 +0000
Subject: Merge branch 'f21' of ssh://pkgs.fedoraproject.org/libsvm into f21


Conflicts:
	libsvm.spec

---

diff --git a/libsvm.spec b/libsvm.spec
index 2c0b755..01fc8f7 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -583,3 +583,4 @@ rm -rf %{buildroot}
 * Fri Aug 17 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-0
 - initial packaging
 
+