Merge tag 'upstream/1.5'
authorJulien Valroff <julien@kirya.net>
Fri, 6 Apr 2012 13:57:23 +0000 (15:57 +0200)
committerJulien Valroff <julien@kirya.net>
Fri, 6 Apr 2012 13:57:23 +0000 (15:57 +0200)
commita3efa986cf002b297973c604b7f277db1866c98c
treec8782668d2c0c4e2a69034b033576d54355339de
parent2db5f9fb92dae3de07db35325982c729fca1865b
parent040e80d1539a0e19b2ae535ac5a44bc2f485345b
Merge tag 'upstream/1.5'

Upstream version 1.5