diff options
author | Timothy Pearson <[email protected]> | 2013-02-21 13:38:18 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-21 13:38:18 -0600 |
commit | 63ae86414f568d34b02619b9fdbd3a9797bdc495 (patch) | |
tree | b074a869b0ed837f5cec1e2714d5758771059b0f | |
parent | d17fac428c5937d2cb590e183e9f412376755419 (diff) | |
parent | 72fc1063560da7ff5d7535f27dc1b08cd403f8ee (diff) | |
download | bibletime-63ae86414f568d34b02619b9fdbd3a9797bdc495.tar.gz bibletime-63ae86414f568d34b02619b9fdbd3a9797bdc495.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/bibletime
m--------- | admin | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin -Subproject 02e2842b6f2a692e432f4ebc10fbe3759a15347 +Subproject d3351c945e680cea403e463eb9898467db140ec |