Merge remote-tracking branch 'origin/master'

This commit is contained in:
Manfred Karrer 2014-08-26 18:31:45 +02:00
commit c455ae176b

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ bitsquare.iml
*.ser
*.log
*.sw[op]
.DS_Store