Merge commit 'refs/merge-requests/1' of git://gitorious.org/document_freedom_day...
authorSam Tuke <samtuke@owncloud.com>
Thu, 20 Mar 2014 14:10:19 +0000 (15:10 +0100)
committerSam Tuke <samtuke@owncloud.com>
Thu, 20 Mar 2014 14:10:19 +0000 (15:10 +0100)
commit72435adf43eed3f5f3b2fc606418d7ee7c3f9419
tree4329ead2acb3fee24804659cc91095977a56c9c6
parent0cfb4f146207870b77232f1bd30c023a3f24c927
parent0800ce9930c2dc5cc7cd9503ee01aaef1eb3220c
Merge commit 'refs/merge-requests/1' of git://gitorious.org/document_freedom_day/artwork into merge-requests/1