Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64
merge w master
fixtest
Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64
Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64
Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64
Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64
fix var
debug
Merge remote-tracking branch 'origin/vagrant-debian-7-wheezy64'