tree 0f234f7c8cd6081461a90c55bb868a89c06b0b74
parent f7aac08cafafc8bdea78edf935c27ca6851dc40a
parent d7cc6023dfc69c34dee91248faf32363f812b648
author Hugo Arès <hugo.ares@ericsson.com> 1474205301 +0200
committer Hugo Arès <hugo.ares@ericsson.com> 1474205324 +0200

Merge branch 'stable-2.12'

* stable-2.12:
  Add 'eclipse-out' to the list of ignored folders

Change-Id: Ia6b10050fc6af57ffa62cb276a27e8047b926971