Merge branch 'bug-637' into release
authorMichael Tänzer <neo@nhng.de>
Mon, 1 Aug 2011 01:20:04 +0000 (03:20 +0200)
committerMichael Tänzer <neo@nhng.de>
Mon, 1 Aug 2011 01:20:04 +0000 (03:20 +0200)
commit4230707947899c893fda70cd9addd592580a477e
treeee53bebccdbecbfaa27a83e905f0b7c5953622d9
parentd378e1f64b257c431f4f76986a123715e46ea888
parente7368868ba88433956ad034fb7883d2dcd9566be
Merge branch 'bug-637' into release
includes/general.php
www/index.php