commit df8c0555a796cbd3a117712943aa178c6fa7e083 Merge: e8df4b9 57fe0b7 Author: Pierre-Yves Chibon <pingou at pingoured.fr> Date: Sat Feb 21 16:26:05 2015 +0100 Merge branch 'master' into f21 .gitignore | 2 ++ sources | 2 +- subsurface.spec | 18 ++++++++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) ---