Merge remote-tracking branch 'alexis/various-fixes'
authorJean Privat <jean@pryen.org>
Thu, 23 Jan 2014 20:34:12 +0000 (15:34 -0500)
committerJean Privat <jean@pryen.org>
Thu, 23 Jan 2014 20:34:12 +0000 (15:34 -0500)
commitfae1c1431a072c2970caee23181d48c2c062422e
tree146be500947035cfc6b4e0e289b2503a68a6e6e2
parenta2a05a477f8bc88dd9826e08e3b7713fb10917f2
parent772834ab96b037fb05afca16ee491de64fef49bb
Merge remote-tracking branch 'alexis/various-fixes'