upstream/20130226
Samuel Thibault
@sthibault
6198e038
·
Merge branch 'upstream' into upstream-merged
·
Feb 26, 2013
New upstream snapshot
