diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-21 11:12:01 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-21 11:12:01 -0300 |
| commit | 918e09f1a47dc3d23440f08a91d91d31d62dcb5a (patch) | |
| tree | effadb1e2c76d3e06975c92516647148ed9f420a /AUTHORS | |
| parent | 0e9e94d70a0442e2c0aebdfb282269e90d688712 (diff) | |
| parent | 971e5b7d0cd614e1be3a82380ef16911f2d9cefe (diff) | |
Merge branch 'master' into fauno
Conflicts:
fullpkg
toru
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,2 +1,2 @@ -Joshua Ismael +Joshua Haase Nicolás Reynolds |