diff options
| author | Milo Casagrande <milo@ubuntu.com> | 2013-02-13 18:35:00 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo@ubuntu.com> | 2013-02-13 18:35:00 +0100 |
| commit | f6e9d7be791b269967311ba281b5705361112669 (patch) | |
| tree | 3da66a5f98dbb2975d00085dc2a3a781ec73d808 /CONTRIBUTORS | |
| parent | d6b2ec12ceddb987c6f9df411f1c02fe32b1fe0a (diff) | |
| parent | 637fcc9fc3f7f177097ed2c590d98a077cbeee26 (diff) | |
Merge branch 'master' into linaro
Fixed conflicts:
setup.py
Diffstat (limited to 'CONTRIBUTORS')
| -rw-r--r-- | CONTRIBUTORS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 8e0bd927..bb64bbfa 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -32,3 +32,4 @@ List of contributors to RhodeCode project: Raoul Thill <raoul.thill@gmail.com> Philip Jameson <philip.j@hostdime.com> Mads Kiilerich <madski@unity3d.com> + Dan Sheridan <djs@adelard.com> |