summaryrefslogtreecommitdiff
path: root/colophon.mdwn
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2014-02-26 15:20:53 +0100
committerThomas Schwinge <thomas@codesourcery.com>2014-02-26 15:20:53 +0100
commit93060a3967ef66873d6246b0b1228c57aed2d9e4 (patch)
tree0dda55d9eaa0fdf687acc80ac2329bdf42c6a652 /colophon.mdwn
parentca63bd2d33b3d28eabd50ad58577b52a1fc9eba0 (diff)
parentc4ad3f73033c7e0511c3e7df961e1232cc503478 (diff)
Merge remote-tracking branch 'feldtkeller.SCHWINGE/master'
Conflicts: news/2011-q2.mdwn open_issues/glibc.mdwn open_issues/versioning.mdwn
Diffstat (limited to 'colophon.mdwn')
0 files changed, 0 insertions, 0 deletions