Merge branch 'master' into dev

This commit is contained in:
clowwindy 2014-06-09 17:47:47 +08:00
commit 4cc979b998

View file

@ -12,7 +12,7 @@ Install
#### Debian / Ubuntu: #### Debian / Ubuntu:
apt-get install build-essential python-pip python-m2crypto python-dev apt-get install python-pip python-m2crypto
pip install shadowsocks pip install shadowsocks
#### CentOS: #### CentOS: