Merge branch 'pyed-xboxclips'
authorSergey M․ <dstftw@gmail.com>
Fri, 8 Aug 2014 12:22:31 +0000 (19:22 +0700)
committerSergey M․ <dstftw@gmail.com>
Fri, 8 Aug 2014 12:22:31 +0000 (19:22 +0700)

Trivial merge