summaryrefslogtreecommitdiff
path: root/wikiicons
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-02 00:07:42 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-02 00:07:42 +0200
commit356571f5ebb2f072829cc981cc2cd4ce0d631471 (patch)
tree318879810543c2cb87ca56f78b52a65599a5a52f /wikiicons
parent07224df24c763fb672f9620fe72119d76a282372 (diff)
parenta8376916ec262b14202287383de4d4de7f832755 (diff)
parente9e3f7af86eb5704def9c285c99e69924ec159cb (diff)
Merge branches 'clean-no_NB' and 'scs-no_NB' into allinone-no_NB