Merge remote-tracking branch 'radoslawc/master'

Conflicts:
	README.md

resolved
This commit is contained in:
Vinta 2014-07-05 01:43:15 +08:00
commit c7d50643da

View File

@ -718,8 +718,8 @@ A curated list of awesome Python frameworks, libraries and software. Inspired by
* [Fabtools](https://github.com/ronnix/fabtools) - Tools for writing awesome Fabric files.
* [cuisine](https://github.com/sebastien/cuisine) - Chef-like functionality for Fabric.
* [doit](http://pydoit.org/) - A task runner/build tool.
* [Supervisor](http://supervisord.org/) - A Process Control System.
* [psutil](https://github.com/giampaolo/psutil) - A cross-platform process and system utilities module.
* [pexpect](https://github.com/pexpect/pexpect) - A Python module for controlling interactive programs in a pseudo-terminal like GNU expect
## Foreign Function Interface