Merge branch 'tests'
authorJean Privat <jean@pryen.org>
Mon, 10 Mar 2014 20:28:36 +0000 (16:28 -0400)
committerJean Privat <jean@pryen.org>
Mon, 10 Mar 2014 20:28:36 +0000 (16:28 -0400)
commit49453ffef9b3808941370fcf8e6a68f554cafdaa
tree9735449355856bbf43ed65441c8d54ff7bf32df7
parente58ccbc2f7cef972683604c7ecde0418663c5774
parent44cd9b287cea559a295837c565584d116fc50e0e
Merge branch 'tests'