Merge tag 'upstream/1.3.0'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 22 Apr 2014 08:43:28 +0000 (10:43 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 22 Apr 2014 08:43:28 +0000 (10:43 +0200)
commit5c8ce397c52b77dd41dc2a0b88417715c6e2c4f2
tree5d88b65b2f7c836ee66ad6dcbfc27ad8dcb5cd64
parent00b47f7832e8285e4e9d7481d5f213b8fd8c618a
parentab2c54c5fc730eda797aafe6ed6a589965f0ed05
Merge tag 'upstream/1.3.0'

Upstream version 1.3.0