Merge branch 'ntrel/doc-macro-examples'
commit63a2f075f6c910add7f56e69c9d24b2757aee5fa
authorColomban Wendling <ban@herbesfolles.org>
Sun, 27 Apr 2014 16:06:01 +0000 (27 18:06 +0200)
committerColomban Wendling <ban@herbesfolles.org>
Sun, 27 Apr 2014 16:06:01 +0000 (27 18:06 +0200)
treeb7f1e05aa8267045f6adb81da854d7a7e5042c87
parentd769e51e97a5e9f5572b91060e4d1377c56bde1a
parent5758b9ca679eb3813c5d8582fe998f76ea507545
Merge branch 'ntrel/doc-macro-examples'