Merge tag 'upstream/0.10.7+git20150512'
authorSophie Brun <sophie@freexian.com>
Tue, 12 May 2015 10:01:49 +0000 (12:01 +0200)
committerSophie Brun <sophie@freexian.com>
Tue, 12 May 2015 10:01:49 +0000 (12:01 +0200)
commit309106c4f8027bc047760622c71c8c0ac96ebc65
tree83ebd4a4778f96a96ed111d7e8032b3f0f6285dc
parent64ff43300fae3a5ae07f76a26aca9a5dcddd28c0
parentc15c4455864da9bc6d5eff7e02d153b19b2a9b51
Merge tag 'upstream/0.10.7+git20150512'

Upstream version 0.10.7+git20150512

Conflicts:
.gitignore
.gitignore