Michael RICOIS 24c63fe4dc Merge from 2.5

2013-11-25 15:58:30 +00:00

..

Auth/Adapter

Merge from 2.5

2013-11-25 15:58:30 +00:00

Wkhtml

2.4 rev 1821

2013-11-05 11:18:30 +00:00

Ws

Merge for release in staging

2013-11-21 16:13:20 +00:00