Merge remote-tracking branch 'lapilofu/hotfix/manifest' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Sat, 8 Oct 2011 01:07:09 +0000 (18:07 -0700)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Sat, 8 Oct 2011 01:07:09 +0000 (18:07 -0700)
commit6de576dc999886f300c5abc74f4a2433a884d3b8
tree662932eed76be2ac71c2ee45bf885535bd55fdef
parenta7d3a2c29add2278e4e9aa3fd8e5ff847a3c9a87
parent38b3b029deb23c1dc242d854fd806c076229e7fe
Merge remote-tracking branch 'lapilofu/hotfix/manifest' into release