Merge branch 'master' of https://github.com/gumartinm/SpringWebServicesForFun
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Sun, 31 May 2015 11:26:30 +0000 (13:26 +0200)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Sun, 31 May 2015 11:26:30 +0000 (13:26 +0200)

Trivial merge