git ignore
Merge https://github.com/binwiederhier/syncany
Merge branch 'master' of https://github.com/binwiederhier/syncany
Merge branch 'master' of https://github.com/binwiederhier/syncany
Merge branch 'master' of https://github.com/binwiederhier/syncany
Merge branch 'master' of https://github.com/binwiederhier/syncany
add pause/resume mecanism to watchOperation
correct pause mecanism .... Thread.sleep is ugly ... but I cant't figure out something cleaner ... using latch ? reentrant lock ?
Merge Vincent's pause/stop fix
Cont'd SQL tests; started FileHistory tests
Merge branch 'master' of https://github.com/binwiederhier/syncany into sqlplayground