diff options
author | Andreas Gohr <andi@splitbrain.org> | 2010-10-08 17:55:38 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2010-10-08 17:55:38 +0200 |
commit | 4ea48b361401e136dbfd3339af368ceeb5b27480 (patch) | |
tree | be549543a7c36718ffb06a6293fe80ee0675ec92 /lib/plugins/plugin/classes | |
parent | 6ef7197027e6c2f3fa521634d6fa93da2e19392a (diff) | |
parent | 3d4b6cf54a3bc3880eb2c662fe73de3acb284da1 (diff) | |
download | rpg-4ea48b361401e136dbfd3339af368ceeb5b27480.tar.gz rpg-4ea48b361401e136dbfd3339af368ceeb5b27480.tar.bz2 |
Merge remote branch 'lupo49/master'
Conflicts:
inc/lang/de-informal/lang.php
Diffstat (limited to 'lib/plugins/plugin/classes')
0 files changed, 0 insertions, 0 deletions