summaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-01-29 20:24:38 -0700
committerSean Leonard <meanderingcode@aetherislands.net>2013-01-29 20:24:38 -0700
commit46f5d395ab2d30d6ca15e91920ee8b30026f443d (patch)
treedbe7d23381992e5867654ebf097d639805971ea7 /openssl
parentece73d2494776a88520e876d8eed9c2e98aad563 (diff)
parent6b5f766c9a1643c3c87bd396d1a23e49144ca813 (diff)
Merge branch 'branding' into develop
Diffstat (limited to 'openssl')
0 files changed, 0 insertions, 0 deletions