Merge branch 'remotestorage0.9-develop' of github.com:remotestorage/remotestorage...
authorggrin <ggrin@lavabit.com>
Thu, 24 Oct 2013 10:49:03 +0000 (12:49 +0200)
committerggrin <ggrin@lavabit.com>
Thu, 24 Oct 2013 10:49:03 +0000 (12:49 +0200)
commit802ee545120ee5bf220b2bd4bf93dfde7b7f886c
tree974499aec7be98edce45f355abeb43a380d7af70
parentf1068ee5de8dd3f51e329a09d6375dcf29851c5d
parentb1b2147e44717ff6e6824771f6e4de46da65eda9
Merge branch 'remotestorage0.9-develop' of github.com:remotestorage/remotestorage.js into remotestorage0.9-develop

Conflicts:
Makefile
src/assets.js
src/dropbox.js
Makefile
src/dropbox.js