Merge remote-tracking branch 'mjb/altosdroid'
authorKeith Packard <keithp@keithp.com>
Thu, 20 Sep 2012 09:30:19 +0000 (11:30 +0200)
committerKeith Packard <keithp@keithp.com>
Thu, 20 Sep 2012 09:30:19 +0000 (11:30 +0200)
commit2f2734bb418f5c3a89fa3f1bf1b98ce4cfe432e1
tree5a5400d13c22e7ca6c666c00f4d391ed8429e3a6
parente69a433fd93b9f6bd2297d8045eb075fee29e73b
parent3fe5c2f9fc01258d45c20070e9874d76bc6c8c07
Merge remote-tracking branch 'mjb/altosdroid'