diff options
| author | Timothy Pearson <[email protected]> | 2013-02-21 13:39:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-21 13:39:24 -0600 |
| commit | cbb75d1896e75a690e62f13df9c55673095f774f (patch) | |
| tree | ffa267e23503690cba233a696496ad01721aaf54 | |
| parent | de8637804e693280514ca6eef2c5a7e62ea9076a (diff) | |
| parent | 01f94c7129196c6d07a2c86fcd784c098d12b8fe (diff) | |
| download | kima-cbb75d1896e75a690e62f13df9c55673095f774f.tar.gz kima-cbb75d1896e75a690e62f13df9c55673095f774f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kima
| m--------- | admin | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin -Subproject 02e2842b6f2a692e432f4ebc10fbe3759a15347 +Subproject d3351c945e680cea403e463eb9898467db140ec |