diff options
| author | Zach Copley <zach@status.net> | 2009-11-19 20:51:20 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-11-19 20:51:20 -0800 |
| commit | 003b25ee5690771ab9d8c28a85352abfee62cd0a (patch) | |
| tree | ac0ba59c0c7e96474aec98d18e106985e6f451b1 /avatar | |
| parent | e3de04f8cd494ba255ff6167542fda849c2fa61c (diff) | |
| parent | e1fcac0e0908be45c9aa7e840a6fcb2ca600eac5 (diff) | |
Merge branch '0.9-release'
* 0.9-release:
Changed DEFINE name to avoid conflicts
Diffstat (limited to 'avatar')
0 files changed, 0 insertions, 0 deletions