Merge branch 'refs/heads/t/image_id_mm'
authorAndre Noll <maan@tuebingen.mpg.de>
Fri, 1 Apr 2016 23:59:11 +0000 (01:59 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sat, 2 Apr 2016 00:11:35 +0000 (02:11 +0200)
commitdb748cc3c4d60e1ec7fefe2ad58142c2820ae07f
tree543b2b99891c73c28c6feb897a24f13a1419a299
parent9d8fdf8898418711558f70a9630b2444036d8285
parent2dddc3b31a08751f50a6ddfc0144c08b67bed314
Merge branch 'refs/heads/t/image_id_mm'

A single commit that was cooking for several months.

* refs/heads/t/image_id_mm:
  server: Add mood methods image_id and lyrics_id.
NEWS
web/manual.m4