Merge remote-tracking branch 'alexis/various-fixes'
authorJean Privat <jean@pryen.org>
Wed, 29 Jan 2014 18:08:33 +0000 (13:08 -0500)
committerJean Privat <jean@pryen.org>
Wed, 29 Jan 2014 18:08:33 +0000 (13:08 -0500)
commited4eb80b2237c5836d503caa854cf60550f4f868
tree18c7d348ac5fc7a29e46f10c1fd346de6950914c
parent85b565ec25797bdf0bb539b11fe7a9ad83f63a23
parent433ca621d3265e36be30d82587c2ef3e98470db9
Merge remote-tracking branch 'alexis/various-fixes'