OSDN Git Service

Merged main
authorrui Batista <ruiandrebatista@gmail.com>
Sun, 8 Apr 2012 14:44:03 +0000 (15:44 +0100)
committerrui Batista <ruiandrebatista@gmail.com>
Sun, 8 Apr 2012 14:44:03 +0000 (15:44 +0100)
1  2 
source/config/__init__.py
source/core.py

Simple merge
diff --cc source/core.py
Simple merge