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)
1  2 
librarian/epub.py

Simple merge