merge ignore
d
w
merge ignore
clean
Merge branch 'master' into pinch_zoom2
Pinch zoom
Label fix for NST
Spanish localization by Marc Armengol
beatify
Localization update
Help update
PageWalker refactoring
PageWalker refactoring
Rotation fix
Pinch zoom for android 2.0-2.1
Fixed crash on big djvu outlines
Drawing page border on scaling
Fixed acquiring lock under lock screen
Fixed wrong outline navigation in djvu