Merge tag 'upstream/1.3.1'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 22 Apr 2014 09:08:31 +0000 (11:08 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 22 Apr 2014 09:08:31 +0000 (11:08 +0200)
commit607545a9b3a79cedb6218e2bd5bf3aec2fd7320a
tree5d88ca61f094d022e4a69aa6b95b820d586c5539
parent5c8ce397c52b77dd41dc2a0b88417715c6e2c4f2
parent73eabee5220bdce792b25c83391597d84b7e0812
Merge tag 'upstream/1.3.1'

Upstream version 1.3.1