summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-21 13:40:21 -0600
committerTimothy Pearson <[email protected]>2013-02-21 13:40:21 -0600
commitaa7ff77ec33cda10ffb830e8e616fe8d1b517ce8 (patch)
tree171b539e585aced345354ce39e29af8bf5c40528
parentcf0ad6e9741fd014704148800c180922b0fe95f7 (diff)
parentd0c0a5f0c22c54b81e947c644a661046ff5b8582 (diff)
downloadkuickshow-aa7ff77ec33cda10ffb830e8e616fe8d1b517ce8.tar.gz
kuickshow-aa7ff77ec33cda10ffb830e8e616fe8d1b517ce8.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kuickshow
m---------admin0
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin
-Subproject 02e2842b6f2a692e432f4ebc10fbe3759a15347
+Subproject d3351c945e680cea403e463eb9898467db140ec