revert rebasing with sourceforge upstream

fix #799
fix #801
This commit is contained in:
chrox
2014-08-17 17:39:21 +08:00
parent f37faadcf1
commit e68e409469