Changeset 8f74a8a3 in oe-alliance-core

Timestamp:
01/30/16 11:46:25 (7 years ago)
Author:
captain <openatv@…>
Branches:
4.0, 4.3
Children:
78ce9d38
Parents:
b31792f (diff), 17c0c26d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'next' of github.com:oe-alliance/oe-alliance-core into next

(No files)

Note: See TracChangeset for help on using the changeset viewer.