Merge master to solve conflicts
authorJean Privat <jean@pryen.org>
Sat, 13 Jun 2015 11:20:21 +0000 (07:20 -0400)
committerJean Privat <jean@pryen.org>
Sat, 13 Jun 2015 11:20:21 +0000 (07:20 -0400)
commit3ee16363f349c757a395798d799097703d114263
tree23979bfd7b31a36882ca9c7396a628aa7e1a3e40
parentb47949a1e78d3f363dca5798523267abfafc9147
parent9902c7a7b19bb3f69d7850c189c96f58f4ef508d
Merge master to solve conflicts