Merge branch 'hotfix/issue_20130326_01'
我们可以增加新闻了
删除调试代码
check for login
for login
save the login pages
在招聘信息页面加入了管理页面
Merge branch 'feature/liuyuan' into develop
Merge branch 'release/20130326_liuyuan'
创建单独的目录
save一下
Merge branch 'feature/liuyuan' into develop
Merge branch 'release/20130326_2'
save
Merge branch 'hotfix/issue_20130326_02'
Merge branch 'hotfix/issue_20130326_02' into develop
端口号错了，不知道是否和这个有关系
Merge branch 'release/20130326_03'
save
Merge branch 'hotfix/issue_20130326_03' into develop