Merge pull request #3 from goodplayer/master

2013.1.24
spring sec
Merge branch 'master' of https://github.com/ixin/jblog.git
message
Merge pull request #4 from ixin/master

merge