Merge branch 'master' of github.com:dpavlin/bookreader
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 5 Jul 2012 12:40:42 +0000 (12:40 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 5 Jul 2012 12:40:42 +0000 (12:40 +0000)
commitbfc5b5c75a31a5e0a3fe120f08692577e93be768
treeb03da8bc53109a55bc368decab80d44cd04e4dd6
parente7bcdbc42e8c7bbe995673f1f1efafb4f0fe8865
parentf9c8fcad474cd48806932886532d87a1a6bdca33
Merge branch 'master' of github.com:dpavlin/bookreader

Conflicts:
plack/lib/Plack/App/BookReader.pm
plack/lib/Plack/App/BookReader.pm