added code to find ebook-convert
Merge pull request #487 from kbrock/makeebook_fixes

added code to find ebook-convert
[ja] Apply b4854ff8dc42db658df66ecdd8fe2162a73ebdb5

Merge pull request #435 from GArik/EN
https://github.com/progit/progit/commit/b4854ff8dc42db658df66ecdd8fe2162a73ebdb5
Merge pull request #488 from harupong/ja-chapter7

[ja] Apply b4854ff8dc42db658df66ecdd8fe2162a73ebdb5
Fix wrong arrow direction on Dia-version of figure 7.3
Reverse diff in the example with .doc files to match it with the description
modify a chinese character in 01-chapter7.markdown

石 --> 是
Update 01-chapter5.markdown

"e" manquant.
fix a minor problem
Fix a bunch of typos on Dia figures in chapter 3
Merge pull request #493 from chzju/master

[zh] update chapter 9
Merge pull request #491 from AngleMortSociety/patch-1

Update 01-chapter5.markdown
Merge pull request #490 from hex636b/master

modify a chinese character in 01-chapter7.markdown
Merge pull request #489 from GArik/EN

Fix incorrect example in "diffing binary files" section
'e' missing
Merge pull request #494 from AngleMortSociety/patch-2

'e' missing