Merge tag 'upstream/1.1.2'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 07:42:32 +0000 (03:42 -0400)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 07:42:32 +0000 (03:42 -0400)
commit3050ae71f0f0e6558446129c223a976fc15d3d37
tree81904a2a3417d6634c5fb17556a0a267fb415278
parent7509ce8be8e2d669012cd4107a664e99e0ecbaa6
parent4e6ce51e7afeb7924573c40796910cd003850949
Merge tag 'upstream/1.1.2'

Upstream version 1.1.2