Merge pull request #1732 from zhangzl2013/file-clipping
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 10 Mar 2014 12:22:56 +0000 (08:22 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 10 Mar 2014 12:22:56 +0000 (08:22 -0400)
File clipping


Trivial merge