git.samba.org
/
jelmer
/
calypso.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8ae22b9
cf71f64
)
Merge remote-tracking branch 'origin/master'
author
Keith Packard
<keithp@keithp.com>
Thu, 27 Jun 2013 20:40:56 +0000
(13:40 -0700)
committer
Keith Packard
<keithp@keithp.com>
Thu, 27 Jun 2013 20:40:56 +0000
(13:40 -0700)
Conflicts:
calypso/__init__.py
Trivial merge
git.samba.org / jelmer / calypso.git / commitdiff