Resonant x-ray diffraction performed at the L(II) and L(III) absorption edges of Ru has been used to investigate the magnetic and orbital ordering in Ca2RuO4 single crystals. A large resonant enhancement due to electric dipole 2p-->4d transitions is observed at the wave-vector characteristic of antiferromagnetic ordering. Besides the previously known antiferromagnetic phase transition at T(N)=110 K, an additional phase transition, between two paramagnetic phases, is observed around 260 K. Based on the polarization and azimuthal angle dependence of the diffraction signal, this transition can be attributed to orbital ordering of the Ru t(2g) electrons. The propagation vector of the orbital order is inconsistent with some theoretical predictions for the orbital state of Ca2RuO4.