3 Commits

Author	SHA1	Message	Date
Michael RICOIS	a3f0d0b25b	Merge from branch 2.5	2014-01-16 10:47:25 +00:00
Michael RICOIS	24c63fe4dc	Merge from 2.5	2013-11-25 15:58:30 +00:00
Michael RICOIS	50ddcde1c3	Merge for release in staging	2013-11-21 16:13:20 +00:00