merged two doc files
authorFabien Potencier <fabien.potencier@gmail.com>
Fri, 27 Apr 2012 15:42:50 +0000 (17:42 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Fri, 27 Apr 2012 15:50:30 +0000 (17:50 +0200)
commitdb8a1094950acb9d712054df77e55eaa0ef21a60
treef2c76c96a2b327ae57622b742b19d5988c2ef529
parentbbfc7d7aef2e8309c1b1927efe029dc0bb5ffdea
merged two doc files
doc/advanced.rst
doc/extensions.rst [deleted file]