diff options
author | Joey Hess <joey@kitenet.net> | 2012-06-23 10:27:12 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-06-23 10:27:12 -0400 |
commit | d88ee75a2de7c0294a28a8b4309e424608389cc5 (patch) | |
tree | 5838651ebcac3426229e302b7758a19e81822143 /Assistant.hs | |
parent | d707f2dce5c3ed1a56c7bf3d65be7bef105f5dd1 (diff) | |
parent | 325053e8de109329eac31017271134b1c5faef04 (diff) |
Merge branch 'master' into assistant
Diffstat (limited to 'Assistant.hs')
0 files changed, 0 insertions, 0 deletions