Commit graph

2 commits

Author SHA1 Message Date
MatToufoutu
a56eaf8163 resolved conflicts with upstream 2010-12-22 16:24:11 +01:00
MatToufoutu
c3a46cd127 pulled and merged upstream changes 2010-12-21 12:08:40 +01:00