| commit | 77ef0dd39669157a18ca1ff260e735107eeb8e82 | [log] [tgz] |
|---|---|---|
| author | EmergentOrder <lecaran@gmail.com> | Tue Nov 03 13:04:46 2015 -0400 |
| committer | EmergentOrder <lecaran@gmail.com> | Tue Nov 03 13:04:46 2015 -0400 |
| tree | 5f53f7e9dd60164c53de2069c58f6ee8c43a10af | |
| parent | b85d044f83bb4f811232d97db4bb7626222cac83 [diff] | |
| parent | 7b6e210d7ad8147358685f513fab98f58a79039b [diff] |
Merge branch 'fcvarela-develop' into develop