Merge remote-tracking branch 'alexandre/fix-nitdoc'
authorJean Privat <jean@pryen.org>
Mon, 3 Feb 2014 16:27:10 +0000 (11:27 -0500)
committerJean Privat <jean@pryen.org>
Mon, 3 Feb 2014 16:27:10 +0000 (11:27 -0500)
commit5561fa9bf1351d6643f27f3686805932ca086920
tree865d735222a00012a958c0696a1320300112b3aa
parente26533d6bcb6852b0c253b5863b8d7192dc9108b
parent09b01633b294bfcd95e115e3c1ada01e426aff85
Merge remote-tracking branch 'alexandre/fix-nitdoc'