Merge branch 'feature-favourites' into development
authorLuciano Montanaro <mikelima@cirulla.net>
Fri, 27 Dec 2013 14:38:04 +0000 (15:38 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Fri, 27 Dec 2013 14:38:04 +0000 (15:38 +0100)

Trivial merge