Merge branch 'master' into MODULES-1014/add-noop-mode
authorPeter Souter <p.morsou@gmail.com>
Fri, 13 Jun 2014 18:09:08 +0000 (19:09 +0100)
committerPeter Souter <p.morsou@gmail.com>
Fri, 13 Jun 2014 18:09:08 +0000 (19:09 +0100)
commitbf94296c505357c1d2bee08ad7785c5666338a36
treefbc5a6a767da2e4a50cf84bf1be5d039d54da795
parent17c91e7ab8f89453c926b432e5ff82335d280e90
parentd23a098c2deba9fb79ca53e2d51a8177b0f071af
Merge branch 'master' into MODULES-1014/add-noop-mode