Skip to content
Commit 8a2c5dda authored by Florian Hülsmann's avatar Florian Hülsmann
Browse files

Merge commit 'refs/merge-requests/102' of... 

Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102
parents 85f9869f 7ed8f397
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment