diff options
| author | Darrell Anderson <[email protected]> | 2013-04-18 17:47:42 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2013-04-18 17:47:42 -0500 |
| commit | 210473106f70c5df744768803e9861dbe90ddc6d (patch) | |
| tree | ee0c9de1496a0db91225bd0e0aecce0a81551ef2 | |
| parent | c5fa3625c293b7845943720b14a35ba5123f16ea (diff) | |
| parent | c52fda5cc6590320302fdbd1a210ac0a27e250e3 (diff) | |
| download | kaffeine-210473106f70c5df744768803e9861dbe90ddc6d.tar.gz kaffeine-210473106f70c5df744768803e9861dbe90ddc6d.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kaffeine
| m--------- | admin | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin -Subproject 4027b878fb556a51ed29affd578e78aa7099748 +Subproject 307fab5fdad542247fa11a418be0e9635f4b5eb |