[Merge] lp:~timo-jyrinki/ubuntu/utopic/totem/enable_grilo_totem into lp:ubuntu/totem

[Timo Jyrinki]

Timo Jyrinki has proposed merging lp:~timo-jyrinki/ubuntu/utopic/totem/enable_grilo_totem into lp:ubuntu/totem.

Commit message:
* Enable grilo for upnp/dlna support (LP: #1035701)
  - bring back libgrilo-0.2-dev build-dep
  - install grilo plugins
  - drop 93_grilo_optional.patch

Requested reviews:
  Ubuntu branches (ubuntu-branches)
Related bugs:
  Bug #1035701 in totem (Ubuntu): "grilo plugins should be enabled in Totem"
  https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1035701

For more details, see:
https://code.launchpad.net/~timo-jyrinki/ubuntu/utopic/totem/enable_grilo_totem/+merge/219305
-- 
https://code.launchpad.net/~timo-jyrinki/ubuntu/utopic/totem/enable_grilo_totem/+merge/219305
Your team Ubuntu branches is requested to review the proposed merge of lp:~timo-jyrinki/ubuntu/utopic/totem/enable_grilo_totem into lp:ubuntu/totem.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 3685 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140513/a9ca6c7f/attachment.diff>