Merge remote-tracking branch 'upstream/master'
authorRobert Błaut <listy@blaut.biz>
Mon, 3 Mar 2014 20:21:43 +0000 (21:21 +0100)
committerRobert Błaut <listy@blaut.biz>
Mon, 3 Mar 2014 20:21:43 +0000 (21:21 +0100)
commitf26b53f9b72c689f58714b36b31c7e1cdc2dfa2a
tree13be6c51958327d138d7aaf0395774d079c58de9
parent08dc6413258e57f1638f8f91feef63d538d9cdbc
parentccc0df182c479eb554148e5bbc3fd9f6bec95e20
Merge remote-tracking branch 'upstream/master'
librarian/epub.py