summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-21 13:39:55 -0600
committerTimothy Pearson <[email protected]>2013-02-21 13:39:55 -0600
commitb8791ed5b8d5ae6185c1bd5b5f84c4d254e96568 (patch)
tree5bb21f7c52f136c41af78956272c25348119874f
parent42079d32bf92f6796d8bb3d47318881ed02cddaa (diff)
parent4adfc606ed6e48152a0a10ca5d72ad0624e9cb5f (diff)
downloadkonversation-b8791ed5b8d5ae6185c1bd5b5f84c4d254e96568.tar.gz
konversation-b8791ed5b8d5ae6185c1bd5b5f84c4d254e96568.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/konversation
m---------admin0
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin
-Subproject 02e2842b6f2a692e432f4ebc10fbe3759a15347
+Subproject d3351c945e680cea403e463eb9898467db140ec