Merge commit 'refs/merge-requests/21' of git://gitorious.org/owncloud/apps into merge...
authorAlessandro Cosentino <cosenal@gmail.com>
Sun, 19 Aug 2012 17:57:34 +0000 (13:57 -0400)
committerAlessandro Cosentino <cosenal@gmail.com>
Sun, 19 Aug 2012 17:57:34 +0000 (13:57 -0400)
commit0fc2d2c33f9c7336bbca818d10098cb047a77ee3
tree58067e0552c7b6904a50f4f5cd04486b13307b12
parent81e5b884ebeb93aa7b0b4f1d5cf06ae3ab16bfe0
parent4e114de92e1fdb5f94f9eaadc5f37b10fcfea8b5
Merge commit 'refs/merge-requests/21' of git://gitorious.org/owncloud/apps into merge-requests/21