projects / cyrus-sasl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01ea926 7038e83)
Merge branch 'master', remote-tracking branch 'origin'
authorPete Fotheringham <pete.fotheringham@codethink.co.uk>
Sun, 1 Jan 2012 17:55:26 +0000 (17:55 +0000)
committerPete Fotheringham <pete.fotheringham@codethink.co.uk>
Sun, 1 Jan 2012 17:55:26 +0000 (17:55 +0000)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.