projects / puppet_stunnel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b2e969 a4b8195)
Merge remote-tracking branch 'origin/master' into leap_master
authorvarac <varacanero@zeromail.org>
Fri, 14 Jun 2013 18:36:35 +0000 (20:36 +0200)
committervarac <varacanero@zeromail.org>
Fri, 14 Jun 2013 18:36:35 +0000 (20:36 +0200)

Trivial merge
[puppet_stunnel]