Merge branch 'sphinx'
authorIonutz Borcoman <iborco@gmail.com>
Sun, 20 Mar 2011 11:44:33 +0000 (13:44 +0200)
committerIonutz Borcoman <iborco@gmail.com>
Sun, 20 Mar 2011 11:44:33 +0000 (13:44 +0200)
commitcb83e96293869b0bfec082fcb3900ffda3124a8b
tree760df88ed8811798f39a406f41881f82efd07c89
parente9f4e4453accdfd0dfde94aa014af66db02e67ab
parent6ab0ce6370d018381fa36e2f84547f51d504873d
Merge branch 'sphinx'