Merge remote branch 'upstream/master' into bugfixes
authorHans Dedecker <hans.dedecker@technicolor.com>
Thu, 23 Jan 2014 08:49:42 +0000 (09:49 +0100)
committerHans Dedecker <hans.dedecker@technicolor.com>
Thu, 23 Jan 2014 08:49:42 +0000 (09:49 +0100)
commit54a51ca4375c2ae1007e5bea26ebb6dc4e88b638
tree945f606a00cf8746e5e8d2cb5e8fdf2beb8f3dac
parentfa3073b32452d78037d2a8ce2e3ea213b3d5f50c
parent0a41d480c058b68fe09ac7de044c561dee955233
Merge remote branch 'upstream/master' into bugfixes