Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Mon, 28 Oct 2013 17:36:08 +0000 (13:36 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 28 Oct 2013 17:36:08 +0000 (13:36 -0400)
1  2 
docs/user/advanced.rst

Simple merge