Merge branch 'sprint-branch'

2013-05-30 21:39:06 +01:00 · 2013-05-30 21:39:06 +01:00 · 29e63e01ab
commit 29e63e01ab
parent 250247d96c b8aa9fed9a
44 changed files with 732 additions and 549 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -4,6 +4,7 @@ python:
  - 2.6
  - 2.7
  - pypy
+  - 3.3

 install: pip install --editable .

@ -18,9 +19,3 @@ notifications:
  # their own builder failure from us.  Travis currently fails way
  # too many times by itself.
  email: false
-
-  irc:
-    channels:
-      - "irc.freenode.org#pocoo"
-    use_notice: true
-    skip_join: true