Merge tag 'upstream/1.6'
authorJulien Valroff <julien@kirya.net>
Sat, 14 Jul 2012 08:14:35 +0000 (10:14 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 14 Jul 2012 08:14:35 +0000 (10:14 +0200)
commit55d2640d9eea5f21d4a2c9af8e0a7cd53d8f86bd
tree3b45c4ce9f4162190ce7d63412d5bf717ebfebfe
parent9d41a75af3f92cfab71db5f675415523ad95c68f
parent8eb0f7fe76b1b1d77c66234c0854a0e22f9bd6a0
Merge tag 'upstream/1.6'

Upstream version 1.6