Merge branch 'upstream/master' into master
authorSébastien CHAZALLET <s.chazallet@gmail.com>
Thu, 27 Nov 2014 10:25:38 +0000 (11:25 +0100)
committerSébastien CHAZALLET <s.chazallet@gmail.com>
Thu, 27 Nov 2014 10:25:38 +0000 (11:25 +0100)
commitb14653595da8e25c0bdaab6efec46c1537f803c9
tree13d61718c2b28a7f75365620a25fd7d1b9ea1aa4
parent5355c412cee0e9de5fea7f7d3b3580c480708469
parentb7ba30709481858712096db5dca109f8367535d5
Merge branch 'upstream/master' into master