Merge branch 'master' into fork_master

Conflicts: .travis.yml
2012-12-11 12:15:16 +01:00 · 2012-12-11 12:15:16 +01:00 · 95eb771dcd
commit 95eb771dcd
parent 3c6ffbaedb 4fb1acc212
8 changed files with 170 additions and 101 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -3,7 +3,7 @@ python:
  - "2.6"
  - "2.7"
 #  - "3.3"
-script: nosetests test --nocapture
+script: nosetests test --verbose
 notifications:
  email:
    - filippo.valsorda@gmail.com