Merge pull request #624 from nico/landmaxim
authorNico Weber <nicolasweber@gmx.de>
Sat, 20 Jul 2013 04:47:00 +0000 (21:47 -0700)
committerNico Weber <nicolasweber@gmx.de>
Sat, 20 Jul 2013 04:47:00 +0000 (21:47 -0700)
commit3f605a8504cfc5fc5cd2bfae50d45f9d3d34d824
tree6e88e2d40fac1df7352598a20cecf4aa5a951114
parent9bb715e1496572681815fad0142b32236cf6e987
parentd864d8446ce465781127294f6f2d5efa86645967
Merge pull request #624 from nico/landmaxim

Land the first two commits of pull request #608.