From: Thomas Daley <tuluse@yahoo.com>
Date: Sun, 28 Feb 2016 02:45:25 +0000 (-0600)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2d6bde9466285cfe5c01c6bca556a8933cdd88f;p=picodrive.git

Merge remote-tracking branch 'upstream/master'
---

f2d6bde9466285cfe5c01c6bca556a8933cdd88f