Skip to content
Commit 798e6aa4 authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

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

Merge commit 'refs/merge-requests/100' of git://gitorious.org/owncloud/owncloud into merge-requests/100
parents 93c0e8b3 bba434ca
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