From 731cbde006d6cf9ee7f8d6c188b211de26a3d986 Mon Sep 17 00:00:00 2001
From: Soeren Sonnenburg <sonne@debian.org>
Date: Sat, 16 Mar 2013 21:39:41 +0100
Subject: [PATCH] updated changelog

---
 src/ChangeLog | 62 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 58 insertions(+), 4 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 73362fd1701..bcd3be8d1d8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,64 @@
-* commit a77b5baaa22e07fb8e0b597b4452adce1abefcd7
+* commit 0e282c746ca3711b46d31496e6351c33663cbcc1
+| Author: Soeren Sonnenburg <sonne@debian.org>
+| Date:   Sat Mar 16 21:25:39 2013 +0100
+| 
+|     release fixes
+|     
+|     - disable json serialization for now
+|     - rename OCTAVE_LOADPATH -> OCTAVE_PATH
+| 
+| M	examples/undocumented/lua_modular/serialization_complex_example.lua
+| M	src/Makefile.template
+|  
+* commit ec6e14953a4b192a3c9d57ed1a9bb59d39220abc
 | Author: Sergey Lisitsyn <lisitsyn.s.o@gmail.com>
-| Date:   Sat Mar 16 21:04:54 2013 +0400
+| Date:   Sat Mar 16 23:50:51 2013 +0400
 | 
-|     updated changelog
+|     Fixed bug with libsvm 3 classes
 | 
-| M	src/ChangeLog
+| M	examples/undocumented/libshogun/modelselection_grid_search_multiclass_svm.cpp
+| M	src/shogun/multiclass/MulticlassLibSVM.cpp
+|    
+*   commit c77af730f686f4d6b29f14b4a647e45c17436160
+|\  Merge: fc7f16e a88be17
+| | Author: Sergey Lisitsyn <lisitsyn.s.o@gmail.com>
+| | Date:   Sat Mar 16 22:37:10 2013 +0400
+| | 
+| |     Merge branch 'master' of github.com:shogun-toolbox/shogun
+| |     
+| *   commit a88be17180977f29fa5fee9bbfa58bc87e0eecc3
+| |\  Merge: 3d7cf1a 51e5322
+| | | Author: Heiko Strathmann <heiko.strathmann@gmail.com>
+| | | Date:   Sat Mar 16 11:19:29 2013 -0700
+| | | 
+| | |     Merge pull request #942 from karlnapf/master
+| | |     
+| | |     new example for model selection multiclass svm
+| | |    
+| | * commit 51e53229e94afb57b898ac86931ab5f6238fc9bb
+| |/  Author: Heiko Strathmann <heiko.strathmann@gmail.com>
+| |   Date:   Sat Mar 16 18:18:13 2013 +0000
+| |   
+| |       added a modelselection example for multiclass lib svm
+| |   
+| |   M	examples/undocumented/libshogun/Makefile
+| |   A	examples/undocumented/libshogun/modelselection_grid_search_multiclass_svm.cpp
+| |   
+* | commit fc7f16e0ba181fbd2b0c4d27be0cfccf6b55a562
+| | Author: Sergey Lisitsyn <lisitsyn.s.o@gmail.com>
+| | Date:   Sat Mar 16 21:34:59 2013 +0400
+| | 
+| |     updated changelog
+| | 
+| | M	src/ChangeLog
+| |   
+* | commit a77b5baaa22e07fb8e0b597b4452adce1abefcd7
+|/  Author: Sergey Lisitsyn <lisitsyn.s.o@gmail.com>
+|   Date:   Sat Mar 16 21:04:54 2013 +0400
+|   
+|       updated changelog
+|   
+|   M	src/ChangeLog
 |    
 *   commit 3d7cf1a359a310f1e22eff5334b9fb6a3b684ea8
 |\  Merge: 4c7fc6c c758bf6