| commit | 5d194d5cc6779578fffee6ad7802fa2050974dc0 | [log] [tgz] |
|---|---|---|
| author | Avery Pennarun <apenwarr@gmail.com> | Sat Nov 23 01:04:44 2013 -0500 |
| committer | Avery Pennarun <apenwarr@gmail.com> | Sat Nov 23 01:04:44 2013 -0500 |
| tree | c93005134caff25d9845d92f13c58fb1874994e8 | |
| parent | f54b464e0d53288957bc5548c720e8984d599b25 [diff] | |
| parent | 94edd4ec91cc463b36d387ff3bbdbeeda8f2cc89 [diff] |
Merge remote-tracking branch 'origin/master' into openbox Change-Id: Ie756ee76f2073dba91233706d1b06cc01d1ff9d6