Merge branch 'master' into filesystem
authorRobin Appelman <icewind@owncloud.com>
Wed, 1 Feb 2012 14:57:32 +0000 (15:57 +0100)
committerRobin Appelman <icewind@owncloud.com>
Wed, 1 Feb 2012 14:57:32 +0000 (15:57 +0100)
commitd514b1d92d7dad93ddb640829e4598fb6f49fa84
treeb650be0a3cf85194bdd92b97697ad7cc7936f62e
parent0124809a42dd72d9c6d9b550687fa0013a88b6da
parent6583d30e26d752c5ddccb1e350e075f59b7ba75d
Merge branch 'master' into filesystem
settings/personal.php