Merge branch 'master' of ssh://maxious.lambdacomplex.org/git/scannr
[scannr.git] / js / flotr2 / spec / images / butterfly.jpg