Merge remote-tracking branch 'origin/master'
commit250679f656a78124356e22199c6fb6669ccd2bb0
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 23 Jun 2015 10:46:21 +0000 (23 13:46 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 23 Jun 2015 10:46:21 +0000 (23 13:46 +0300)
tree6db9e02657a7c6370d03058010792bdb4594216a
parent2e609624fa8d060e7653ada91247fe497944034b
parentdaa5ca41e9b145d91d2506c9ae0bab4b45bd72be
Merge remote-tracking branch 'origin/master'