Merge pull request #2552 from akallabeth/sample_update
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Mon, 20 Apr 2015 15:47:44 +0000 (17:47 +0200)
committerBernhard Miklautz <bmiklautz@users.noreply.github.com>
Mon, 20 Apr 2015 15:47:44 +0000 (17:47 +0200)
Sample update


Trivial merge