summaryrefslogtreecommitdiff
path: root/smiley
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-19 17:22:47 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-19 17:22:47 +0200
commit0195f9d307c7c184f3e056a816124d24ae272531 (patch)
treed5c49b0acaec02d26a5accdaaea158a367d02916 /smiley
parent00d14a048bfbcc85c905ab2c22b122e63c1de8d3 (diff)
parent077f4b7319c36f2c8bc243b462a992f10e896573 (diff)
Merge branch 'master' into _multilang
Conflicts (manually resolved: merge old and new parts): .gitmodules
Diffstat (limited to 'smiley')
0 files changed, 0 insertions, 0 deletions