Merge branch 'master' of git.sourceforge.jp:/gitroot/shogi-server/shogi-server

Conflicts:
	changelog

diff --cc changelog
index 0175279,7e4e6e8..9ee5707
--- 1/changelog
--- 2/changelog
+++ b/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +2012-01-06  Daigo Moriwaki <daigo at debian dot org>
 +
 +      * [shogi-server]
 +        - test/TC_logger.rb depeneded on a specific directory where it was
 +          running on. This issues has been fixed.
 +
+ 2012-01-01  Daigo Moriwaki <daigo at debian dot org>
+ 
+       * [shogi-server]
+         - shogi_server/floodgate.rb: Generating next time around the new
+           year day by reading configuration files did not work correctly.
+           This issue has been fixed.
+ 
  2011-12-18  Daigo Moriwaki <daigo at debian dot org>
  
        * [sohgi-server]