Merge branch 'master' of https://github.com/Sankore/Sankore-3.1
authorshibakaneki <didier@sente.ch>
Thu, 16 Aug 2012 08:50:12 +0000 (10:50 +0200)
committershibakaneki <didier@sente.ch>
Thu, 16 Aug 2012 08:50:12 +0000 (10:50 +0200)
commit1ab1945f2ec04553c916d88faa1fe66208e695f7
tree14de1df1ad8e617082d83d55dcb3b5d091d520c3
parent4cbaab56375c61474ea1bd0fe3f9d69a8f7e9d49
parentc3fde72746f8fede29e8a42342bac0ed1767eb90
Merge branch 'master' of https://github.com/Sankore/Sankore-3.1