Merge remote-tracking branch 'ivan/update-supported-os'
authorMicah Anderson <micah@riseup.net>
Tue, 29 Jul 2014 15:58:00 +0000 (11:58 -0400)
committerMicah Anderson <micah@riseup.net>
Tue, 29 Jul 2014 15:58:00 +0000 (11:58 -0400)
Conflicts:
docs/client/en.md

1  2 
docs/client/en.md

Simple merge