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)
commitd81579bdf9d5d12864cad053e301e8d06e8947ea
tree3c397af261bfd69981d036826f77928e31db70a2
parent8c3ffd1281f1081719c8f76494e411c1e026561a
parenta9abd75448989c40268eb33681646a112472f4bb
Merge branch 'feature-favourites' into development