Merge branch 'v3.3'

ciromattia · Sep 29, 2013 · 143b2a7 · 143b2a7
2 parents d327a72 + e7b47d2
commit 143b2a7
Show file tree

Hide file tree

Showing 20 changed files with 2,340 additions and 745 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ dist
 kindlegen*
 .DS_Store
 Thumbs.db
-UnRAR.exe
+/UnRAR.exe
+/7za.exe