Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.com>
Fri, 18 Oct 2013 10:14:02 +0000 (12:14 +0200)
committerChristian Johansen <christian@gitorious.com>
Fri, 18 Oct 2013 10:14:02 +0000 (12:14 +0200)
commit243334713f341cfefc733ca5c6d68b659a622f07
treebd30034fbe5536e09f9e0f256a207f9ac85755c0
parentff84ca757d8b26e0bfc71de7e634d393365b2b7d
parent38f59df233925b79efd5c4c37a77f74eae882f76
Merge branch 'master' of gitorious.org:gitorious/mainline

Conflicts:
lib/tasks/assets.rake