diff options
| author | Timothy Pearson <[email protected]> | 2013-02-21 13:38:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-21 13:38:44 -0600 |
| commit | 4cf665c82181899db84835ed0c6a943d847a0f97 (patch) | |
| tree | 61b4d062af4b9208f65e063e8992d4f56fa14256 /admin | |
| parent | cb1acc3941abb40d644b8da93ba70db671302568 (diff) | |
| parent | a2ed647a5262bbd8243e6d249dc6bba1574d9f14 (diff) | |
| download | kaffeine-4cf665c82181899db84835ed0c6a943d847a0f97.tar.gz kaffeine-4cf665c82181899db84835ed0c6a943d847a0f97.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kaffeine
Diffstat (limited to 'admin')
| m--------- | admin | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin -Subproject 02e2842b6f2a692e432f4ebc10fbe3759a15347 +Subproject d3351c945e680cea403e463eb9898467db140ec |