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)
commit59120d5c3371f6b6af762c074f3dcf6bc9597a63
tree44af2ef57e8ab54655676a329afc579f9cb89a81
parent5dfe42eff24171f89fc282ee60a8b9efa0069741
parent03cddf25a41e34383537522d60d1a8b11d66d776
Merge remote-tracking branch 'ivan/update-supported-os'

Conflicts:
docs/client/en.md
docs/client/en.md