diff options
author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-10-06 22:18:50 (GMT) |
---|---|---|
committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-10-06 22:18:50 (GMT) |
commit | 18e64e44925a286494d565b4998dbed86df524f7 (patch) | |
tree | fccf7aa2cf9d200263f1f1df3b43ff9417049896 | |
parent | 7f1a78537e45e1d18331d339f347546102a3b3fc (diff) | |
parent | 11afc83ff0d2558210065539ba7675f639b9fa04 (diff) |
Merge remote branch 'origin/next' into pu
-rw-r--r-- | AUTHORS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ rainbow-0.8.*: Michael Stone <michael@laptop.org> (irc: m_stone, trac: mstone) -Sascha Silbe <silbe@sugarlabs.org> (irc: silbe, trac: silbe) +Sascha Silbe <silbe@sugarlabs.org> (irc: silbe, trac: sascha_silbe) rainbow-0.7.*: Michael Stone <michael@laptop.org> (irc: m_stone, trac: mstone) |