Thomas Citharel 82978fbd57 Merge branch 'master' into dev ...

To get the errors

2015-01-03 11:38:32 +01:00

..

3rdparty

merge epub with all the dev evolutions

2014-12-14 00:16:22 +01:00

poche

Merge branch 'master' into dev

2015-01-03 11:38:32 +01:00