Merge https://github.com/bamos/nbd
authorWouter Verhelst <w@uter.be>
Sat, 25 Oct 2014 10:35:26 +0000 (12:35 +0200)
committerWouter Verhelst <w@uter.be>
Sat, 25 Oct 2014 10:35:26 +0000 (12:35 +0200)
* https://github.com/bamos/nbd:
  Disable swap option on Android.


Trivial merge